Cleanup Locale class, fix broken tests