Added ping/pong functionality and removed a test which was not working properly