update all unit tests and functional tests
merging
update all unit tests and functional tests