Fix some busted tests