Possible matches with one player tests passed, much refactctoring