Fix broken tests

Tests created by a47afd76700308d26a68 wouldn't pass at all.