Feature/3.0 backport2

Fix issue with numericality custom tests.  Adapted from b73ba75db9cd1f3993e16de670a784dca0e15714.

Finished tests in 0.553978s, 270.7689 tests/s, 337.5585 assertions/s.

150 tests, 187 assertions, 0 failures, 0 errors, 0 skips