Extend config file by scripts + changes for unit tests