Fix comment blocks
Update utils test to reflect changed funciton signature