Improve dynamic test provision