Cosmetic changes in tests