testing updates
testing updates
Merge pull request #2 from connamara/master

start adding some tests