added johns tests
Merge pull request #10 from MartyBurns/master

added johns tests