Redo --test and --dry-run
Bugfixes for --test and --dry-run
Messaging tweaks