Changed names of tests
Changed name of test files