CB-6897 - Added unit test