added some model tests, added some validations (more still needed in both aspects)