Add lib header file
Fix tests