Expanded and adjusted CI tests, included Complications-Other-Comment fields