Fixed the rest of the tests + renamed to Contains/NotContains