More cleanup of this formatting test stuff