Switch to individual scripts to handle build vs test