Improve word test