update config handling
unit tests