improved test validations