#87 - fixed and added tests for listen and listen-live.