Fixed plugin provider + tests