fixed minor issues for testbed