diff --git a/apps/explorer_web/test/explorer_web/features/address_page_test.exs b/apps/explorer_web/test/explorer_web/features/address_page_test.exs
new file mode 100644
index 0000000000..605938bfa7
--- /dev/null
+++ b/apps/explorer_web/test/explorer_web/features/address_page_test.exs
@@ -0,0 +1,106 @@
+defmodule ExplorerWeb.AddressPageTest do
+  use ExplorerWeb.FeatureCase, async: true
+
+  import Wallaby.Query, only: [css: 2]
+
+  alias Explorer.Chain.{Credit, Debit}
+
+  setup do
+    block =
+      insert(:block, %{
+            number: 555,
+            timestamp: Timex.now() |> Timex.shift(hours: -2),
+            gas_used: 123_987
+             })
+
+    for _ <- 0..3, do: insert(:transaction) |> with_block(block)
+    insert(:transaction, hash: "0xC001", gas: 5891) |> with_block
+
+    lincoln = insert(:address, hash: "0xlincoln")
+    taft = insert(:address, hash: "0xhowardtaft")
+
+    transaction =
+      insert(
+        :transaction,
+        hash: "0xSk8",
+        value: Explorer.Chain.Wei.from(Decimal.new(5656), :ether),
+        gas: Decimal.new(1_230_000_000_000_123_123),
+        gas_price: Decimal.new(7_890_000_000_898_912_300_045),
+        input: "0x00012",
+        nonce: 99045,
+        inserted_at: Timex.parse!("1970-01-01T00:00:18-00:00", "{ISO:Extended}"),
+        updated_at: Timex.parse!("1980-01-01T00:00:18-00:00", "{ISO:Extended}"),
+        from_address_id: taft.id,
+        to_address_id: lincoln.id
+      )
+
+    insert(:block_transaction, block: block, transaction: transaction)
+
+    receipt = insert(:receipt, transaction: transaction, status: 1)
+    insert(:log, address_id: lincoln.id, receipt: receipt)
+
+    # From Lincoln to Taft.
+    txn_from_lincoln =
+      insert(
+        :transaction,
+        hash: "0xrazerscooter",
+        from_address_id: lincoln.id,
+        to_address_id: taft.id
+      )
+
+    insert(:block_transaction, block: block, transaction: txn_from_lincoln)
+
+    insert(:receipt, transaction: txn_from_lincoln)
+
+    internal = insert(:internal_transaction, transaction_id: transaction.id)
+
+    Credit.refresh()
+    Debit.refresh()
+
+    {:ok, %{internal: internal}}
+  end
+
+  test "see's all addresses transactions by default", %{session: session} do
+    session
+    |> visit("/en/addresses/0xlincoln")
+    |> assert_has(css(".transactions__link--long-hash", text: "0xSk8"))
+    |> assert_has(css(".transactions__link--long-hash", text: "0xrazerscooter"))
+  end
+
+  # test "can see internal transactions for an address", %{
+  #   session: session,
+  #   internal: internal
+  # } do
+  #   session
+  #   |> visit("/en/transactions/0xSk8")
+  #   |> click(link("Internal Transactions"))
+  #   |> assert_has(css(".internal-transaction__table", text: internal.call_type))
+  # end
+
+  test "can filter to only see transactions to an address", %{session: session} do
+    session
+    |> visit("/en/addresses/0xlincoln")
+    |> click(css("[data-test='filter_dropdown']", text: "Filter: All"))
+    |> click(css(".address__link", text: "To"))
+    |> assert_has(css(".transactions__link--long-hash", text: "0xSk8"))
+    |> refute_has(css(".transactions__link--long-hash", text: "0xrazerscooter"))
+  end
+
+  test "can filter to only see transactions from an address", %{session: session} do
+    session
+    |> visit("/en/addresses/0xlincoln")
+    |> click(css("[data-test='filter_dropdown']", text: "Filter: All"))
+    |> click(css(".address__link", text: "From"))
+    |> assert_has(css(".transactions__link--long-hash", text: "0xrazerscooter"))
+    |> refute_has(css(".transactions__link--long-hash", text: "0xSk8"))
+  end
+
+  test "views addresses", %{session: session} do
+    insert(:address, hash: "0xthinmints", balance: 500)
+
+    session
+    |> visit("/en/addresses/0xthinmints")
+    |> assert_has(css(".address__balance", text: "0.000,000,000,000,000,500 POA"))
+  end
+
+end
diff --git a/apps/explorer_web/test/explorer_web/features/contributor_browsing_test.exs b/apps/explorer_web/test/explorer_web/features/contributor_browsing_test.exs
index 80e7319eae..e44afab42e 100644
--- a/apps/explorer_web/test/explorer_web/features/contributor_browsing_test.exs
+++ b/apps/explorer_web/test/explorer_web/features/contributor_browsing_test.exs
@@ -223,38 +223,5 @@ defmodule ExplorerWeb.UserListTest do
       |> click(css(".transaction-log__link", text: "0xlincoln"))
       |> assert_has(css(".address__subheading", text: "0xlincoln"))
     end
-
-    test "see's all addresses transactions by default", %{session: session} do
-      session
-      |> visit("/en/addresses/0xlincoln")
-      |> assert_has(css(".transactions__link--long-hash", text: "0xSk8"))
-      |> assert_has(css(".transactions__link--long-hash", text: "0xrazerscooter"))
-    end
-
-    test "can filter to only see transactions to an address", %{session: session} do
-      session
-      |> visit("/en/addresses/0xlincoln")
-      |> click(css("[data-test='filter_dropdown']", text: "Filter: All"))
-      |> click(css(".address__link", text: "To"))
-      |> assert_has(css(".transactions__link--long-hash", text: "0xSk8"))
-      |> refute_has(css(".transactions__link--long-hash", text: "0xrazerscooter"))
-    end
-
-    test "can filter to only see transactions from an address", %{session: session} do
-      session
-      |> visit("/en/addresses/0xlincoln")
-      |> click(css("[data-test='filter_dropdown']", text: "Filter: All"))
-      |> click(css(".address__link", text: "From"))
-      |> assert_has(css(".transactions__link--long-hash", text: "0xrazerscooter"))
-      |> refute_has(css(".transactions__link--long-hash", text: "0xSk8"))
-    end
-  end
-
-  test "views addresses", %{session: session} do
-    insert(:address, hash: "0xthinmints", balance: 500)
-
-    session
-    |> visit("/en/addresses/0xthinmints")
-    |> assert_has(css(".address__balance", text: "0.000,000,000,000,000,500 POA"))
   end
 end