Simplify test conditions and fix test compile errors.y