Refactor of Writer tests and add more tests.