Need to update the tests for this function.