Testbed 1 integration

Testbed 2 integration