small fixes to get all the tests to pass/run