cosmetic fixes in tests