Clean up stringstream usage some more
Make sure that the matcher passed to expect() is really a matcher