Corrected all tests and ensured running