Initial refactor for minitest refactor