Consolidated test files