Better name/comment for rows and columns routine and a better test for it.