Update xunit.runners also
Manage other strange cases