Fix
Fix
Remove resources
Update test