Added test case and removed unused dependency modules.