Added several config options and updated tests and config loader.