Update word_count & tests