Improved implementation to work with current state of Testbed Runtime development branch