Revert "== is numeric comparison, we want eq"

This reverts commit 6e813b81f488b29db07cf78e6ea2a40e846f9c3b.
Updating tests for new crb domain