Preparing for move to script/test to run single tests.