Fix tests which depended on formatting.