Test fixes and reformats.