Use Number base class for numeric constraints and move Contains out of test (was acidental)