Modified tests to get them all passing
Merge pull request #30 from salamanders-2014/new-tests-passing

Modified tests to get them all passing