fix peerIds serialization & marshalling bug (and add more tests to cover failing scenarios)
improve readability of provided configuration files