Refactored all tests and ready for printing