Fix tests to actually look for content

Missing should made previous tests useless.  This fixes them up by
adding the missing should and also adding one more test that should
have been in there all along.