Moved ml conversion out of set and more tests about that