Discussion integration tests

Needs another review please...
Agreed, some of this config won't change per-user