Bug 22944: change unit tests