Add tests for Lab model

What does this mr do?

This MR adds tests for the Lab model

src/test/java/nl/tudelft/ewi/queue/model/LabTest.java

@@ -20,6 +20,7 @@ package nl.tudelft.ewi.queue.model;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
@@ -78,17 +79,11 @@ public class LabTest {
 
 	private RequestType submissionRequestType;
 
-	private Lab lab;
+	private Lab lab, tempLab;
 
 	private User user;
 
-<<<<<<< HEAD
 	@BeforeEach
-=======
-	private Lab tempLab;
-
-	@Before
->>>>>>> 233f02cc... Change tempLab constructor inside @Before
 	@Transactional
 	public void setUp() {
 		questionRequestType = new RequestType("Question");
@@ -632,7 +627,7 @@ public class LabTest {
 				lab.getAllowedRequestTypes().get(0), "", lab);
 		r1.setSlot(new RequestSlot(LocalDateTime.of(2020, 1, 1, 0, 0), LocalDateTime.of(2020, 1, 1, 1, 0)));
 		tempLab.setRequests(Collections.singletonList(r1));
-		assertThat(tempLab.position(user)).isEqualTo("00:00 - 01:00");
+		assertThat(tempLab.position(user)).isEqualTo("January 1 2020 at 00:00 - 01:00");
 	}
 
 	@Test