Tests fixed. SchemaMatcher repsonsibility changed.
Merge branch 'master' of https://github.com/s2way/nrcm