Name changes to separate unit tests from integration tests