Fix header file compilation
Add test