diff --git a/tests/test_meta_tax_implication.py b/tests/test_meta_tax_implication.py
index 2e98dcb623074b19c381b12c5e79140e2b87f242..62d80f79662d206a4cca46d0f99ab242bf613361 100644
--- a/tests/test_meta_tax_implication.py
+++ b/tests/test_meta_tax_implication.py
@@ -57,7 +57,7 @@ def hook():
 @pytest.mark.parametrize('src_value,set_value', VALID_VALUES.items())
 def test_valid_values_on_postings(hook, src_value, set_value):
     txn = testutil.Transaction(postings=[
-        ('Accrued:AccountsPayable', 25),
+        ('Liabilities:Payable:Accounts', 25),
         ('Assets:Cash', -25, {TEST_KEY: src_value}),
     ])
     errors = list(hook.run(txn))
@@ -67,7 +67,7 @@ def test_valid_values_on_postings(hook, src_value, set_value):
 @pytest.mark.parametrize('src_value', INVALID_VALUES)
 def test_invalid_values_on_postings(hook, src_value):
     txn = testutil.Transaction(postings=[
-        ('Accrued:AccountsPayable', 25),
+        ('Liabilities:Payable:Accounts', 25),
         ('Assets:Cash', -25, {TEST_KEY: src_value}),
     ])
     errors = list(hook.run(txn))
@@ -77,7 +77,7 @@ def test_invalid_values_on_postings(hook, src_value):
 @pytest.mark.parametrize('src_value,set_value', VALID_VALUES.items())
 def test_valid_values_on_transactions(hook, src_value, set_value):
     txn = testutil.Transaction(**{TEST_KEY: src_value}, postings=[
-        ('Accrued:AccountsPayable', 25),
+        ('Liabilities:Payable:Accounts', 25),
         ('Assets:Cash', -25),
     ])
     errors = list(hook.run(txn))
@@ -87,37 +87,34 @@ def test_valid_values_on_transactions(hook, src_value, set_value):
 @pytest.mark.parametrize('src_value', INVALID_VALUES)
 def test_invalid_values_on_transactions(hook, src_value):
     txn = testutil.Transaction(**{TEST_KEY: src_value}, postings=[
-        ('Accrued:AccountsPayable', 25),
+        ('Liabilities:Payable:Accounts', 25),
         ('Assets:Cash', -25),
     ])
     errors = list(hook.run(txn))
     assert errors
     testutil.check_post_meta(txn, None, None)
 
-@pytest.mark.parametrize('account', [
-    'Accrued:AccountsPayable',
-    'Expenses:General',
+@pytest.mark.parametrize('count,account', enumerate([
+    'Assets:Payable:Accounts',
+    'Assets:Prepaid:Expenses',
+    'Equity:OpeningBalance',
+    'Expenses:Other',
+    'Income:Other',
     'Liabilities:CreditCard',
-])
-def test_non_asset_accounts_skipped(hook, account):
+    'Liabilities:Payable:Accounts',
+    'Liabilities:UnearnedIncome:Donations',
+], 1))
+def test_non_payment_accounts_skipped(hook, account, count):
+    amount = count * 100
     meta = {TEST_KEY: 'USA-Corporation'}
     txn = testutil.Transaction(postings=[
-        (account, 25),
-        ('Assets:Cash', -25, meta.copy()),
+        (account, amount),
+        ('Assets:Checking', -amount, meta.copy()),
     ])
     errors = list(hook.run(txn))
     assert not errors
     testutil.check_post_meta(txn, None, meta)
 
-def test_prepaid_expenses_skipped(hook, ):
-    txn = testutil.Transaction(postings=[
-        ('Expenses:General', 25),
-        ('Assets:PrepaidExpenses', -25),
-    ])
-    errors = list(hook.run(txn))
-    assert not errors
-    testutil.check_post_meta(txn, None, None)
-
 def test_asset_credits_skipped(hook, ):
     txn = testutil.Transaction(postings=[
         ('Income:Donations', -25),