Modify diagram core tests