Refactor behave tests

test/login_logout/test/behave/features/login.feature

@@ -10,8 +10,6 @@ Scenario: Open the oAuth application
 
 Scenario: Login with a valid user with access to application
     Given the element "input#username" is visible
-    And I expect that element "input#password" is visible
-    And I expect that element "input#submit" is visible
     When I enter the "username" in the inputfield "input#username"
     And I enter the "password" in the inputfield "input#password"
     And I click on the button "input#submit"
@@ -35,11 +33,14 @@ Scenario: Logout
     And I expect that element "input#password" is visible
     And I expect that element "input#submit" is visible
 
-Scenario: Login with a valid user without access to an application
+Scenario: Navigate to Login page after logout
     When I open the URL "url"
     Then I wait on element "input#username" for 1000ms to be visible
     And I expect that element "input#password" is visible
     And I expect that element "input#submit" is visible
+
+Scenario: Login with a valid user without access to an application
+    Given the element "input#username" is visible
     When I enter the "username2" in the inputfield "input#username"
     And I enter the "password" in the inputfield "input#password"
     And I click on the button "input#submit"