Test sketch updates

This never got pulled in before, just resubmitting it.