Merge "Fix test build"