Rename test files and integrate them into test suites