Change naming convetions for test files