Fix more trivial test failures