Tweak scripts to automatically start with test data set