Fix wikipedia redirections
Fix broken tests