betamax fixes and branch that replaces junit with testng