Branch for developing Bitten client/server testing