Rework netdx tests