Clean tests and rename base data providers