Adding a couple more options on the cli.
Cleanup - doesn't quite work yet.
Don't save test file.