Fixed up UTs based on changes to drivers