A few test fix-ups