Fix the tests by removing verify_contents.

Verify_contents is very fragile and can easily make you think
something is broken.  I replaced all references to it with
regular contain_file checks.