Beginning of tests for "contains" operators, couple of "contains foreach" assertions + comments
Refactoring: get rid of some overly complicated stuff