Fixed validations, added tests