Merge pull request #1 from slkennedy/sara-master

Adds tests with 3 passing
Merge branch 'master' into sara-master