DocCode test fixes per Jay's findings on 12/4/2014