diff --git a/platform/funcTests/project1/module1/scripts/_suite.ijs b/platform/funcTests/project1/module1/scripts/_suite.ijs
index dbf9dac86b66..07d83c77caef 100644
--- a/platform/funcTests/project1/module1/scripts/_suite.ijs
+++ b/platform/funcTests/project1/module1/scripts/_suite.ijs
@@ -1,3 +1,8 @@
-%cd ../community/platform/funcTests/project1/module1/scripts
+%include include/init.ijs
 
-%include selectIn/projectView.ijs
\ No newline at end of file
+%include typeahead/chooseByName.ijs
+
+%include navbar/navigation.ijs
+
+%include selectIn/project_projectView.ijs
+%%include selectIn/project_packageView.ijs
\ No newline at end of file
diff --git a/platform/funcTests/project1/module1/scripts/include/init.ijs b/platform/funcTests/project1/module1/scripts/include/init.ijs
index e69de29bb2d1..b3b3953b37e0 100644
--- a/platform/funcTests/project1/module1/scripts/include/init.ijs
+++ b/platform/funcTests/project1/module1/scripts/include/init.ijs
@@ -0,0 +1 @@
+%cd {script.dir}/../../../..
\ No newline at end of file
diff --git a/platform/funcTests/project1/module1/scripts/include/project1Init.ijs b/platform/funcTests/project1/module1/scripts/include/project1Init.ijs
new file mode 100644
index 000000000000..0619a73d3345
--- /dev/null
+++ b/platform/funcTests/project1/module1/scripts/include/project1Init.ijs
@@ -0,0 +1,4 @@
+%include init.ijs
+
+%action CloseProject
+%call openProjectClone(project1)
\ No newline at end of file
diff --git a/platform/funcTests/project1/module1/scripts/navbar/navigation.ijs b/platform/funcTests/project1/module1/scripts/navbar/navigation.ijs
new file mode 100644
index 000000000000..e4f61d5e3222
--- /dev/null
+++ b/platform/funcTests/project1/module1/scripts/navbar/navigation.ijs
@@ -0,0 +1,5 @@
+%include ../include/project1Init.ijs
+
+%action ViewNavigationBar
+%action GotoClass
+PsiManager\n
\ No newline at end of file
diff --git a/platform/funcTests/project1/module1/scripts/selectIn/project_packageView.ijs b/platform/funcTests/project1/module1/scripts/selectIn/project_packageView.ijs
new file mode 100644
index 000000000000..964ec249fa02
--- /dev/null
+++ b/platform/funcTests/project1/module1/scripts/selectIn/project_packageView.ijs
@@ -0,0 +1,8 @@
+%include ../include/project1Init.ijs
+
+%action GotoClass
+PsiManager\n
+%action SelectIn
+%[right]
+2\n
+%call checkFocus(selectedNodes=PsiManager|toolWindowTitle=com.intellij.testProject.idea.PsiManager|toolWindowTab=com.intellij.testProject.idea.PsiManager)
\ No newline at end of file
diff --git a/platform/funcTests/project1/module1/scripts/selectIn/projectView.ijs b/platform/funcTests/project1/module1/scripts/selectIn/project_projectView.ijs
similarity index 71%
rename from platform/funcTests/project1/module1/scripts/selectIn/projectView.ijs
rename to platform/funcTests/project1/module1/scripts/selectIn/project_projectView.ijs
index def6ee85a2c6..3b00c769e983 100644
--- a/platform/funcTests/project1/module1/scripts/selectIn/projectView.ijs
+++ b/platform/funcTests/project1/module1/scripts/selectIn/project_projectView.ijs
@@ -1,5 +1,5 @@
-%action CloseProject
-%call openProjectClone(../community/platform/funcTests/project1)
+%include ../include/project1Init.ijs
+
 %action GotoClass
 PsiManager\n
 %action SelectIn
diff --git a/platform/funcTests/project1/module1/scripts/typeahead/chooseByName.ijs b/platform/funcTests/project1/module1/scripts/typeahead/chooseByName.ijs
new file mode 100644
index 000000000000..ca1db7f34290
--- /dev/null
+++ b/platform/funcTests/project1/module1/scripts/typeahead/chooseByName.ijs
@@ -0,0 +1,8 @@
+%include ../include/project1Init.ijs
+
+%action GotoClass
+PsiManager\n
+%call checkFocus(editorTab=PsiManager.java)
+%action GotoClass
+ActiveLibrary\n
+%call checkFocus(editorTab=ActiveLibrary.java)