Fixed some errors
Merge pull request #3 from bpross-52n/2014-08-06-fix-tests

Fixed some errors