Fix build
Add missing files
Fix unit test