MOAR test coverage and flake8 cleaning!