Changing test running system to use a dedicated script.  Much more control now.