refactoring to make the kwstyle tests happier

Change-Id: Id3e60756518bd26bfca0252af2d35c8e8f02e71d
clean up tests

and fix rectilinear grid reading

Change-Id: Ieface42e318f8cdc478c927881ee0363053b0b22
Fix the comment.

Change-Id: Icdedcafeb06c1b4dc114f002ba349cefb1cc141d