TRUNK-3902 made some changes and part of the unit test