Refactor tests for students