Merge "fastdeploy: fix tests."