TRUNK-3751 3 new unit tests