artf732585: Unit test case dependent module and bug fixing