Move to @dblock preferred testing format