Tidy tests a little