Added tests
Merge pull request #2 from cs371p-fall-2013/jrh4289

Added tests