Added back noqa to pass flake8 build, altered test.