Issue 966: Worksheet analysis workflow fixes and tests