Nata dev

Tests bug fixed