variants with count words
fix few tests