Merge "Add full unit tests for listener"