Cleaned code in test files.