Cleanup
Upgrade to minitest 5