Fixes
Fix tests