Merge "WriterTest: Add more tests"