fixed tests
Merge pull request #19 from petebrooks/tests

fixed tests