- Refactored code in org.elearning.models.test package