More tests for Configuration. Included config tests. Updated some CLI code.