added more pre-validation tests, small fixes in comment wording