Add ability to run build on test

I've added the ability to run the build on test as well as deploy and tidied a few bits up that I came across.

Open for discussion.
Just noticed that the prepare and test were commented out, this means that the archive is never created. Is this purposeful?