wrote a whole bunch o tests
Merge branch 'writing-tests'