Fixed the unit tests.
Merge pull request #3 from bennyjo/make-tests-pass

Fixed the unit tests.