[SYNCOPE-392, SYNCOPE-471] integration test improvement + some fixes around sync matching/unmatching rules