Added MatesValidator
Added tests to MatesValidator