Add provider tests
fix cs & rearrange cache collectors