Fixed json serializers, introduced multiple gateways, 1 test fails (need to more responsability from gateway to cloud)