More updates to Python unit tests to remove 1-D stuff.
Merge branch 'baagaard/remove-1d'

* baagaard/remove-1d:
  More updates to Python unit tests to remove 1-D stuff.