Fix the forward-one tests in commit 10b161db526611b4888d7f449ada86f7c55cf42f.

Invalid move shapes were allowed.
A bit excessive on the parameterization.