Refactoring Report to avoid from high memory usage
Adding DataInjector preparing test container