Split mate tests into own classes. Added move ordering