Fix #6645.  Raises warning on use of cols and update unit tests