Progress on handling free moves, test coverage.