Adding scenarios for server version