Modified CH test to allow degenerate cases