Transaction and Protocol tests passed again after some rework.