CLSN-2085 code review till 3rd dec - sonu
test case should be written in test module