Add validation to existing models and change tests to confirm to the validations

Resolves #74