move test utils again so that it can be easily found by the integration testsuite at runtime
Merge remote-tracking branch 'origin/master'