Merge "WriterTest: Fix bounds check"