Fix busted tests