Tests

fning
Merge pull request #83 from alexbragdon/Iteration-4-dev

I just pushed these tests to dev 4