Got all tests passing