diff --git a/views/classes.hbs b/views/classes.hbs
index 9603e2d..739f959 100644
--- a/views/classes.hbs
+++ b/views/classes.hbs
@@ -1,8 +1,7 @@
 <section class='classes'>
-	{{> class name='13(3) Chemistry' teacher='Dr M Ashley' id=1 }}
-	{{> class name='13(3) Chemistry' teacher='Dr M Ashley' id=2 }}
-	{{> class name='13(3) Chemistry' teacher='Dr M Ashley' id=3 }}
-	{{> class name='13(3) Chemistry' teacher='Dr M Ashley' id=4 }}
+	{{#each classes}}
+		{{> class name=name teacher=teachers.[0] id=id }}
+	{{/each}}
 </section>
 
 <script>
diff --git a/views/partials/class.hbs b/views/partials/class.hbs
index 6156423..419591a 100644
--- a/views/partials/class.hbs
+++ b/views/partials/class.hbs
@@ -1,4 +1,6 @@
 <div class='classes__class adminItem' data-id={{ id }}>
 	<h2>{{ name }}</h2>
-	<h3>{{ teacher }}</h3>
+	{{#with teacher}}
+		<h3>{{ fullName }}</h3>
+	{{/with}}
 </div>
diff --git a/views/tests.hbs b/views/tests.hbs
index b6e79ce..d9c5dc2 100644
--- a/views/tests.hbs
+++ b/views/tests.hbs
@@ -11,48 +11,15 @@
 						<th>Date</th>
 					</tr>
 				</thead>
-				{{> test
-					id='1'
-					name='Organic Synthesis'
-					class='MKA_133'
-					subject='Chemistry'
-					date='01/08/2021'
-				}}
-				{{> test
-					id='2'
-					name='Organic Synthesis'
-					class='MKA_133'
-					subject='Chemistry'
-					date='01/08/2021'
-				}}
-				{{> test
-					id='3'
-					name='Organic Synthesis'
-					class='MKA_133'
-					subject='Chemistry'
-					date='01/08/2021'
-				}}
-				{{> test
-					id='4'
-					name='Organic Synthesis'
-					class='MKA_133'
-					subject='Chemistry'
-					date='01/08/2021'
-				}}
-				{{> test
-					id='5'
-					name='Organic Synthesis'
-					class='MKA_133'
-					subject='Chemistry'
-					date='01/08/2021'
-				}}
-				{{> test
-					id='6'
-					name='Organic Synthesis'
-					class='MKA_133'
-					subject='Chemistry'
-					date='01/08/2021'
-				}}
+				{{#each tests}}
+					{{> test
+						id=id
+						name=template.name
+						class=class.name
+						subject=class.subject.name
+						date=date
+					}}
+				{{/each}}
 			</table>
 		</div>
 	</div>