- Added net_id support to config_template - Changed integration test to use blocks to cleanup on failure