Small fixes: unit tests, config, etc