Added method matchers, refactored method scorer. Added further unit tests.