Fix failing tests from previous commit
Fix failing tests from previous commit

C-B4/unifiedpush-server,C-B4/unifiedpush-server,aerobase/unifiedpush-server,aerobase/unifiedpush-server,C-B4/unifiedpush-server,C-B4/unifiedpush-server,aerobase/unifiedpush-server