GCM adapter supports improvements + Some tests added