Update for an Issue #352
Minor fix (digest live test case) and some refactoring