Various updates to test automation script.
Various updates that were small and just to get the tests running.