minor changes to a few testbed classes