More tweaks to testbed