By default do not continue on to long-running tests; save images in directory

Also cleans up indentation issues and delete end-of-line semicolons