Making headway on unit tests.