Fix mock rules so that move tests pass again.