Discussion integration tests

Needs another review please...
Looks like another unneccessary string concatenation?