Fix bad unit tests