Extended tests and help, added w-parse token for general word