fix some failing tests, mino cleanup