Begin adding util functions with tests