Move two test files into common test directory