Fixing unit tests and config-template