Added tests; fixed Doxygen-comments