using Push instance instead of static calls.
fixing tests