Update shell tests infrastructure.

I still need to delete the old code in the inspector that deals with this.