Fix some test failures (FINALLY)