updated util function names & tests