Refactored for Minitest 5.2