Richard, Andy #FIX adding option to control threads, adding tests for default values for options