diff --git a/features/environment.py b/features/environment.py
index f3a0e13b..71ed8969 100644
--- a/features/environment.py
+++ b/features/environment.py
@@ -84,4 +84,3 @@ def after_scenario(context, scenario):
         clean_all_working_dirs()
     else:
         clean_all_working_dirs()
-
diff --git a/features/format.feature b/features/format.feature
index b1d1ce78..2c14b3c1 100644
--- a/features/format.feature
+++ b/features/format.feature
@@ -109,7 +109,6 @@ Feature: Custom formats
 
             ####### ATX H4
 
-
             ######## ATX H5
 
             ######### ATX H6
diff --git a/features/password.feature b/features/password.feature
index ead0f6fe..06c65faa 100644
--- a/features/password.feature
+++ b/features/password.feature
@@ -12,7 +12,6 @@ Feature: Using the installed keyring
         Then the config for journal "simple" should have "encrypt" set to "bool:True"
         When we run "jrnl simple -n 1"
         Then the output should contain "2013-06-10 15:40 Life is good"
-        But the output should not contain "Password"
 
     Scenario: Encrypt journal with no keyring backend and do not store in keyring
         Given we use the config "simple.yaml"
@@ -37,6 +36,7 @@ Feature: Using the installed keyring
             y
             """
         Then we should get no error
+        # @todo add step to check contents of keyring
 
     @todo
     Scenario: Open an encrypted journal with wrong password in keyring
@@ -46,11 +46,15 @@ Feature: Using the installed keyring
     Scenario: Open encrypted journal when keyring exists but fails
     # This should ask the user for the password after the keyring fails
 
-    Scenario: Loading an encrypted journal
-        Given we use the config "encrypted.yaml"
-        When we run "jrnl -n 1" and enter "bad doggie no biscuit"
-        Then we should be prompted for a password
-        And the output should contain "2013-06-10 15:40 Life is good"
+    @todo
+    Scenario: Decrypt journal with password in keyring
+
+    @todo
+    Scenario: Decrypt journal without a keyring
+
+    @todo
+    Scenario: Decrypt journal when keyring exists but fails
+    # This should ask the user for the password after the keyring fails
 
     Scenario: Mistyping your password
         Given we use the config "simple.yaml"
diff --git a/features/steps/core.py b/features/steps/core.py
index 756f260b..43a3bad7 100644
--- a/features/steps/core.py
+++ b/features/steps/core.py
@@ -368,11 +368,13 @@ def flush_stderr(context):
 
 
 @then("we flush all the output")
-def flush_stderr(context):
-    context.execute_steps('''
+def flush_all_output(context):
+    context.execute_steps(
+        """
         Then we flush the output
         Then we flush the error output
-    ''')
+    """
+    )
 
 
 @then("the output should be")