Cosmetics
Refactored some test - made more modular