Tidy up and bump version
Add testing to makefile, add --quit-after