Attempt to fix some test failures