Also removes a largely duplicate test file and changes the other one to use autogenerated CHECK lines.