Changed help formatter to provide default values.
Updated tests to test with variant texts. Removed supplied query tests and functionality, pending a fix to #22.