Tech Debt: Slight refactoring of tests