re-factoring the test files.