Fixing server integration tests