Unit tests updated.
Unit test update
Merge pull request #2 from bancer/master

Unit tests