Cosmetic updates to tests