Code review fixes

pep8 import fixes, removed unused variables, removed unneeded @pytest.mark