rename and add test files