Restored unit tests.