Updated models and corresponding tests

can you comment on the required # noqa ?