Added more tests + normalized validator options w/ tests + draft implementation of model validations (untested)