Improved Query countable test