Added tests for Module, also cleaned up and fixed aliases in DI