change test files location
resolve conflict in TestWriter
Merge pull request #47 from Doha2012/master

change test files location