Fixes to testbed