Add spec matchers, fix tests