This is part 2 of changing Test to test