Unit test case for Address and Name added and few other changes