Test refactoring. introduced "inconsistency free" Matcher for Project
Enforced use of new matcher in all tests.