refactor utils
rename test files