Add unit tests for NA