edited tests structure