provider: Implement @igalic's feedback.
tests: Implement @igalic's feedback.