Added test with different server types