Add the ability to specify test on the command line.
No need to reload plugin.
Watch is now activated with --watch flag.
Minor cleanup.