new version
Test util + config files for tests
Merge with previous pranch