Rename .h to .hpp
Fix headers in tests