Fixes for unit tests and compilation
Merge pull request #187 from jsight/compilefixes

Fixes for unit tests and compilation