added more transaction and fixed some test about push notifications