Faster version of countna
Tests for countna

Make countna tests more robust