More test fixes and doxygen comments