Fixing bugs in testbed