Merge "Fix misused assertTrue in unit tests"