moar validations & test