refactored out minitest support