Minitest fixups