Add additional config settings and some comments.  Add simple test case.