3705: use helper functions in tests