Updated DI and tests no now, hopefully, handle alias better