FIXUP with the Search engine rewrite
Fix test: NumericBigDecimalBridgeTest