Adapted current tests to conform to the changed defaults
Adapted current tests to conform to the changed defaults

dev-osrose/osIROSE-new,RavenX8/osIROSE-new,dev-osrose/osIROSE-new,RavenX8/osIROSE-new,RavenX8/osIROSE-new,dev-osrose/osIROSE-new