tweaked tests per recommendation

Author: lesliehuh

test-data/unit/check-classes.test

@@ -7385,7 +7385,7 @@ class A(thing=5):
     pass
 [out]
 main:1: error: Unexpected keyword argument "thing" for "__init_subclass__" of "object"
-tmp/builtins.pyi:5: note: "__init_subclass__" of "object" defined here
+tmp/builtins.pyi:7: note: "__init_subclass__" of "object" defined here
 [builtins fixtures/object_with_init_subclass.pyi]
 
 [case testInitSubclassWithImports]

test-data/unit/check-functions.test

@@ -3569,7 +3569,8 @@ class Bar(Foo):
 
 [case testInvalidUnpack]
 from foo import bar  # type: ignore[import-not-found]
-from typing import Any
+from typing import Any, Optional
+
 
 def g(x: Any):
     pass
@@ -3586,7 +3587,6 @@ def f2(x: list[int]):
 def f3(x: Any):
     return g(*x)
 
-from typing import Optional
 def f4(x: Optional[int]):
     return g(*x) # E: Expected iterable as variadic argument