Updates to testbed