new test infrastructure, added support for branches
removed config for next branch (there is currently no next branch)