Working XML config
DI config and tests