#2 Generating import statements for used types; Restructuring "complex" test case to make use of imports