fixes for passing the tests