cluster and server test tool update
added 1/2/3 zones in end-to-end test