Merge "Bug 5543 - Bo: Update JUnit tests part_4"