Fix some tests and add more comments around move numbers.