Refactor Instructor tests