Fixes to reduce warnings
Make unit tests run
remove warning (fixed type)