Add missing dependency
Fix unit tests