Modify TestWriter

Adding some test methods