Refactor tests for feedback and self-assessment