Test fixes (and formatting)