cont matching quasar refactor - all tests but last one pass [ci skip]