Fix issue with saveOnSet change failing tests