Updated tests for new (old) reply behaviour
Fixed some pep8 errors