Updated tests, fixed wordcounter script