Address CR: test all failures, match not if/else