Updated unit test and fixed compilation errors
Merge pull request #3 from crawley/master

Bug fixes and unit tests