Fix tests in order to pass test/functional.