Refactored test files