Change to just split out util

The buffered tests are being modified, get into a parallel lane

Author: cmaloney