renamed test files and fixed tests issue