* Dont include APACHE license in doxygen comments
 + Added two test cases