B-62703 Fixed more functional tests