diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb
index 769efbc512..951ea9477c 100644
--- a/test/controllers/orders_controller_test.rb
+++ b/test/controllers/orders_controller_test.rb
@@ -1,14 +1,18 @@
 require 'test_helper'
 
 class OrdersControllerTest < ActionController::TestCase
-  # setup do
-  #   @order = orders(:one)
-  # end
-  #
-  # test "should get index" do
-  #   get orders_url
-  #   assert_response :success
-  # end
+  setup do
+    @order = orders(:one)
+  end
+
+#   test "get index shows all orders" do
+#    session[:merchant_id] = merchants(:one).id
+#    order_one = orders(:one)
+#
+#    assert_response :success
+#    assert_template :index
+#
+# end
   #
   # test "should get new" do
   #   get new_order_url
diff --git a/test/controllers/payment_details_controller_test.rb b/test/controllers/payment_details_controller_test.rb
index f67ecd3ab0..532eb7fb4e 100644
--- a/test/controllers/payment_details_controller_test.rb
+++ b/test/controllers/payment_details_controller_test.rb
@@ -1,7 +1,38 @@
 require 'test_helper'
 
 class PaymentDetailsControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
+  test "should show payment detail" do
+    get :show, {id: payment_details(:payment_card).id}
+    assert_response :success
+  end
+
+  test "should get new" do
+    get :new, order_id: payment_details(:payment_card).id
+
+    assert_response :success
+  end
+
+  # test "should create payment detail" do
+  #   order_id = payment_details(:controller_test_card).order_id
+  #   # assert_difference('PaymentDetail.count', 1) do
+  #     post :create, { payment_detail:
+  #       {
+  #         order_id: order_id,
+  #         buyer_name: "Testing Person",
+  #         email: "mama@mama.com",
+  #         street: "Hauptstrasse",
+  #         city: "Hamburg",
+  #         state: "Germany",
+  #         zip: 54321,
+  #         cc_four_digits: 5105,
+  #         cc_expiration_date: "2017-10-24 13:53:49 -0700",
+  #         time_placed: "2016-10-24 12:53:49 -0700",
+  #         CVV: 111
+  #       }, order_id: order_id
+  #     }
+  #   # end
+  #
+  #   assert_response :redirect
+  #   assert_redirected_to payment_details_path
   # end
 end
diff --git a/test/fixtures/payment_details.yml b/test/fixtures/payment_details.yml
index 2681e69c77..0f11a58cee 100644
--- a/test/fixtures/payment_details.yml
+++ b/test/fixtures/payment_details.yml
@@ -36,5 +36,19 @@ payment_card:
   zip: 12345
   cc_four_digits: xxxx
   cc_expiration_date: ????
-  time_placed: $$$$
+  time_placed: "2016-10-24 12:53:49 -0700"
+  CVV: ???
+
+controller_test_card:
+  order: filter_order_complete_shipped
+  buyer_name: "Ada Lovelace"
+  email: "ada@adadevacademy.com"
+  street: "Fourth Avenue"
+  city: "Seattle"
+  state: "WA"
+  zip: 12345
+  cc_four_digits: xxxx
+  cc_expiration_date: ????
+  time_placed: "2016-10-24 12:53:49 -0700"
   CVV: ???
+