fixed predicate test and allow units in DeviceAttributesPredicateProvider