added missing utils for tests
Merge branch 'master' into issue4