[CDF-400] - Adding test