Updates for new TestBox 2.0