Merge "Function test updates"