Separate test files again, why?