added some more validation and tests