Netengine issue#33: improvements and testing, import to be reviewed