Rework data providers and tests