Fix interface
Add test file
Add header file