Refactoring the staff tests into multiple files