make partner more fluent and fix test