Added Listener class and test command