Fixing test and tidying config file