fixing test errors on fresh checkout
Merge remote-tracking branch 'origin/master' into test-writing
Merge pull request #5 from garza/test-writing

Test writing