Keep public only #choose_mark, #pick_move and #make_move. Refactor tests.