Fix some tests.

* Some of the 2D model tests are still failing, but since I am
  about to massively re-write all that code, I will ignore that
  for now.