[artf649621]: unit test related changes made