Innovation: test-box fixes.

Change-Id: I25b8b6e85eaa70805d401e96b1fb86a0262f1c6a