Refactor tests with boolean matchers