Test server

Idea: do the merge in config/configuration, once and for all.