add new changes for unittests
merge changes