[CDE-177] Adding unit test