Fixing up the unit tests.