Adjusted config-tests for new options