Further reversion of unit tests.