Refactor existing tests, add specs for untested methods and remove
minitest