Got all tests to pass