Be slightly more Pythonic
Add test for "--word"