Remove draw tests.
Connect gateway server to zone server.