new switch -s to allow testing with a dirty working copy