Matthias Wessendorf you can take a look at my working branch and give ideas https://github.com/polinankoleva/aerogear-unifiedpush-server/tree/AGPUSH-2176_consumer_tests