fix en-US
Add missing tests