diff --git a/src/routes/test.rb b/src/routes/test.rb
index df97614..8700697 100644
--- a/src/routes/test.rb
+++ b/src/routes/test.rb
@@ -15,6 +15,7 @@ class GameData < Sinatra::Base
   get '/test/add' do
     hardware = Hardware.order(:name).all()
     benchmarks = Benchmark.order(:name).all()
+
     erb :'test/add', locals: {
       title: 'Add Test',
       hardware: hardware,
@@ -46,23 +47,28 @@ class GameData < Sinatra::Base
     }
   end
 
-  get '/test/:hardware_id/edit' do
-    hardware = Hardware.where(id: params[:hardware_id]).first()
+  get '/test/:test_id/edit' do
+    tst = Test.where(id: params[:test_id]).first()
+    hardware = Hardware.order(:name).all()
+    benchmarks = Benchmark.order(:name).all()
+
     erb :'test/edit', locals: {
-      title: "Editing: #{hardware.name}",
-      hardware: hardware
+      title: "Editing: #{tst.name}",
+      test: tst,
+      hardware: hardware,
+      benchmarks: benchmarks
     }
   end
 
-  post '/test/:hardware_id/edit' do
-    hardware = Hardware.where(id: params[:hardware_id]).first()
+  post '/test/:test_id/edit' do
+    tst = Test.where(id: params[:test_id]).first()
 
-    hardware.update(
-      name: params[:hardware_name],
-      type: params[:hardware_type]
+    tst.update(
+      name: params[:test_name],
+      type: params[:test_type]
     )
 
-    redirect "/hardware/#{hardware.id}"
+    redirect "/test/#{tst.id}"
   end
 
 end
diff --git a/views/index/index.erb b/views/index/index.erb
index 81f20bc..4309ad3 100644
--- a/views/index/index.erb
+++ b/views/index/index.erb
@@ -17,7 +17,7 @@
           <% tests.each do |t| %>
             <tr>
               <td><a href="/test/<%= t.id %>"><%= t.name %></a></td>
-              <td><%= t.benchmark.length %></td>
+              <td><%= t.benchmarks.length %></td>
               <td><%= t.updated_at %></td>
             </tr>
           <% end %>
diff --git a/views/test/edit.erb b/views/test/edit.erb
index 23cde7e..db3395d 100644
--- a/views/test/edit.erb
+++ b/views/test/edit.erb
@@ -1,30 +1,47 @@
-<div class="row">
+<div class="row mb-3">
   <div class="col-12">
-    <h1>Editing: <%= hardware.name %></h1>
+    <h1>Editing: <%= test.name %></h1>
   </div>
 </div>
 
 <div class="row">
 
-  <form class="col-12" action="/hardware/<%= hardware.id %>/edit" method="post">
-    <div class="row mb-3">
-      <div class="col-12 col-md-9">
-        <label for="hardware_name">Hardware name</label>
-        <input id="hardware_name" class="form-control" type="text" name="hardware_name" placeholder="Example hardware" value="<%= hardware.name %>">
+  <form class="col-12" action="/test/<%= test.id %>/edit" method="post">
+    <div class="row mb-0 mb-md-3">
+      <div class="col-12 col-md-6 mb-3 mb-md-0">
+        <label for="test_name">Test name</label>
+        <input id="test_name" class="form-control" type="text" name="test_name" placeholder="My hardware test (01/99)" value="<%= test.name %>">
       </div>
 
-      <div class="col-12 col-md-3">
-        <label for="hardware_type">Type</label>
-        <select id="hardware_type" class="form-control" name="hardware_type">
-          <option value="gpu" <% if hardware.type == 'gpu' %>selected<% end %>>Graphics card</option>
-          <option value="cpu" <% if hardware.type == 'cpu' %>selected<% end %>>Processor</option>
+      <div class="col-12 col-md-6 mb-3 mb-md-0">
+        <label for="test_hardware">Hardware to test</label>
+        <select id="test_hardware" class="form-select" name="test_hardware">
+          <% for h in hardware %>
+            <option value="<%= h.id %>" <% if h.id == test.hardware.id %>selected<% end %>><%= h.name %></option>
+          <% end %>
         </select>
       </div>
     </div>
 
+    <div class="row mb-0 mb-md-3">
+      <div class="col-12 col-md-4 mb-3 mb-md-0">
+        <label for="test_benchmarks">Benchmarks</label>
+        <select id="test_benchmarks" class="form-select" name="test_benchmarks[]" multiple>
+          <% for b in benchmarks %>
+            <option value="<%= b.id %>"><%= b.name %></option>
+            <% end %>
+        </select>
+      </div>
+
+      <div class="col-12 col-md-8 mb-3 mb-md-0">
+        <label for="test_description">Test description</label>
+        <textarea id="test_description" class="form-control" name="test_description" placeholder="This is my test for a hardware..."><%= test.description %></textarea>
+      </div>
+    </div>
+
     <div class="row">
       <div class="col-12">
-        <input class="btn btn-primary w-100" type="submit" value="Submit Changes">
+        <input class="btn btn-primary w-100" type="submit" value="Create Test">
       </div>
     </div>
   </form>