Fixes ticket 22024, on 1.6.x, just adds tests for assertContains

Hope you like 'em!