touch up util unit tests