Merge "Update test as the parameters are removed from production code" into main