Simplify how test arguments are generated