Feature/3.0 backport2

Fix issue with numericality custom tests.  Adapted from b73ba75db9cd1f3993e16de670a784dca0e15714.