Improve test helper