Fix move search tests.

- Use identifiers instead of names

- Give nicer error messages

- Update some of the expected results to
  reflect changes made in Gen VI