Filled in more tests
Merge pull request #5 from SatorSquare/corey

Filled in more tests
Merge pull request #6 from MichaelStinson/corey

Corey
changes
fixed conflicts