Fix tests, cosmetic.