Make extra test cases non-explicit