Moving tests to standard locations to allow code coverage.