Merge "WriterTest: Add listener test"