Merge cleanups
Fix build and updated doxygen
Fix unit test