Fix include
Fix tests