Update unit tests to check for wrapper on RHS of comparisons.