Discussion integration tests

Needs another review please...
Comment followed by empty line. Outdated comment? If so, please remove.