@braddunbar should I include these test style fixes in this PR?