Discussion integration tests

Needs another review please...
see comment above