testbed minor cleanup + todo