fixing providers and tests