Fix 2 tests broken by #20, one bug.