Updated Validation Tests