Adds descriptive failure message to assertContains
Makes UsagePoint step more generic