Add test for `hitch`, find bug, fix bug, profit.