Small work on unit tests.