Fixed some include headers, bugs and better comment for the user part test
Final version