Fix
Add missing tests