fixes for passing tests