Updated test helper