Updated models and corresponding tests

If # noqa is not used, I get the error:
comparison to False should be 'if cond is False:' or 'if not cond:'