Improve other test providers