Function name change and test addition