Update test baselines, and minor code cleanup
Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Update test baselines, and minor code cleanup