Remove remaining xunit references