removing pytest, adding coverage, refactoring/renaming