Add contains statement
Add unit/integration tests for contains
Merge branch 'feature/contains' into develop