Rename two files previously renamed in error.
Comment out tests not under integration to get whole suite to run.

Once the tests have been fully refactored to use pytest this suite
file will need to be rewritten/renamed.