new test infrastructure, added branch support