Tidy up scripts, add test prefix