B-52709 All unit tests passing