Move funcs to util and add tests for them
Merge branch 'master' of github.com:kentaro/evergreen