Refactors test code (again)
Improves code comments