fixes to make all the tests work