Merge pull request #9 from EldonYoder/testing

Merging in some working tests...
more testing added