WordMapExtensions unit tests added.  Slight style tweeks