Improve configuration parser and add test for the new options. Fixes #17