Merge "minor test fix"