Updated extension
Added dependency injection tests