Fixing the unit tests.