Wrote simple model validation, renamed spec files to be more expressive