Fix up the unit tests a little bit