Restore the comments tests lost in the move.