Fix build
Fix tests