making all tests passing