fix test, and remove old file that came in with the merge