Refactored tests, now 100% more DRY