Rename test files
Do refactoring