Update source code and deleted DI test cases