fix remaining test failures