Re-enable metric tests
Update dnets code to new graph structures