reduce property testing work
non-exhaustive pattern match warning fix