Updates to unit tests and config.