TRUNK-3569: Unit tests added