Add more verbose matchers / asserts to tests