* Fixing push status that has been broken since moving to a client * Adding unit test to cover the bug