Fix up unit tests that fail

* 7 old tests still fail