Removed staticness from test providers

Change-Id: I08331edb2bef90595f4df75d2baede52d3b41c1c
Merge "Removed staticness from test providers"