(*) CTL-45 Added unit tests