MERGE FIX: Pegin witness test cleanup
MERGE FIX: Pegin witness test cleanup

ElementsProject/elements,ElementsProject/elements,ElementsProject/elements,ElementsProject/elements,ElementsProject/elements,ElementsProject/elements