Accidentally commented-out test cases pulled back in