DoiDao more unit tests and corresponding corrections