clean up the tests with matchers