Proper Majiang.match and tests