NEW. Fix free moves, add test