Minor refactoring
Merge branch 'develop-mators11' of github.com:oskopek/CryptoIM into develop-mators11
Fixed tests after config file change