OEP-22664 unit test fixes - sometimes the attribute is a number and not a string