Improvments to the script to get us actually running tests.