Fix for Zero word bug inc. test. Clearer semantic separation of char and word count work