Added further validation tests