more fixes to make tests pass