refactoring matchers, bugfix in spec