Tidy some tests