Cosmetic changes to tests