new test infrastructure, branch support