PingPongPersistent tested and refactored