Use more data types in tests.
Update tests to ensure proper filtering with `contains`
Improve support for filtering with `contains`