Revert "Add crude support for containment lookup, breaks key querying"

This reverts commit 4027eba21063099c72ed6de02ef3d5c79e819ca5.
Update test to properly perform containment lookup and not key query.