Some fixes for testing non-ruby servers