Got more unit tests passing.