Fixes for passing the tests