nat: api,cli and test update & cleanup