more matchers
more assertions, move things around