tests
Merge pull request #14 from fox-squirrels-2013/miya_tests

tests