Fix and tidy tests