edited tests + generators