Corrected
Organised integration tests to get a good spot for ServerClientTests.