Fix all tests and are now passing