Danliu/testfix

Fix functional test failures.