Merge "Fix ExtServices tests"