Fix all the unit tests (I hope)