- also fix and update unit tests - see bug #5242821 Change-Id: I29e029bab8ade336a430f9a2a5073caaf11b8dda