Fixing a few broken unit tests.