Added tests for Word examples; cosmetics