testbed fixes