Add custom matchers for scopes and refactor tests.