Test Push, Some small changes