Added WriterTest changes, and TriangleSearchTest.
Merge conflict.