Broken tests

[Dreamsorcerer]

Something has gone wrong over time and now we have 4 broken integration tests. These need to be fixed.

They currently have return added into the tests before the broken line.