updated tests
Merge pull request #28 from otters-2014/Ian-Marco-Wild-Testing-Adventures

updated tests