Minor fixes from the test box

Change-Id: I5707d9c56e5f6f72eb3a8ef14a30b5e905339144