Removed unused classes
Changed to a single BasicModule from TestDIFactory