Improve cross test procedure and formatting