init infrastructure
add util.class and tests for him
Merge remote-tracking branch 'origin/master'