Updated zd test so they do not use diagrams

(for the moment)