Using a new naming scheme for tests