diff --git a/lrr_database.sql b/lrr_database.sql
index ae9266f..01bb528 100644
--- a/lrr_database.sql
+++ b/lrr_database.sql
@@ -200,7 +200,7 @@ CREATE TABLE `lab_reports_table` (
 
 INSERT INTO `lab_reports_table` (`Lab_Report_ID`, `Course_ID`, `Posted_Date`, `Deadline`, `Instructions`, `Title`, `Attachment_link_1`, `Attachment_link_2`, `Attachment_link_3`, `Attachment_link_4`, `Marks`, `Type`) VALUES
 (1, 10, '2019-01-11 16:52', '2019-02-11 17:00', 'Description of the lab....', 'Reading 1', '700IMPORTANT WORDS.txt', '', '', '', '4', 'Individual'),
-(2, 10, '2019-01-17 11:12', '2019-01-25 23:59', 'Read this paper http://sunnyday.mit.edu/16.355/budgen-david.pdf', 'Reading 2', '586LRR-Test-caseS.pdf', '', '', '', '6', 'Individual'),
+(2, 10, '2024-09-29 11:12', '2024-12-30 23:59', 'Read this paper http://sunnyday.mit.edu/16.355/budgen-david.pdf', 'Reading 2', '586LRR-Test-caseS.pdf', '', '', '', '6', 'Individual'),
 (3, 12, '2020-04-05 02:48', '2020-04-12 ', 'Do this assignment in time for testing', 'First Assignment Testing', '', '', '', '', '3', 'Group'),
 (4, 12, '2020-04-05 05:36', '2020-04-06 ', 'We are testing to see if the instructor can be able to modify the work', 'Second Assignment Testing', '', '', '', '', '3', 'Individual'),
 (5, 12, '2020-04-05 05:51', '2020-04-08 ', 'ASQDASDASCDD', 'Third Assignment Testingas', '', '', '', '', '3', 'Individual'),
diff --git a/test/SeleniumHui/test_lrr.py b/test/SeleniumHui/test_lrr.py
index 4a17d91..58c5ea6 100644
--- a/test/SeleniumHui/test_lrr.py
+++ b/test/SeleniumHui/test_lrr.py
@@ -218,7 +218,62 @@ def test_student_can_join_course(driver, url, restore_database):
     assert 'Joined' in elems[0].text
 
 
-@pytest.mark.skip()
-def test_student_can_submit_assignment():
-    # Student can submit Take-home quiz 1 for CSC1001
-    assert True
+def test_student_can_submit_assignment(driver, url, restore_database):
+    ''' Note: Make sure the fields Posted_Date and Deadline in the second row of lab_reports_table are in the current year'''
+    # Student can submit assignment for CSC1111
+    login(driver, url, '201825800050', '123')
+    driver.maximize_window()
+
+    # Enter into the course and the find the assignment
+    elems = driver.find_elements(By.CLASS_NAME, 'btn-default')
+    time.sleep(3)
+    elems[1].click()
+
+    elem = driver.find_element(By.XPATH, '//div[@id="menu1"]/div/div/p/a[text()="Submit"]') # find the submit button
+    time.sleep(3)
+    elem.click()
+
+    # Fill submission title, attach file, and submit
+    elem = driver.find_element(By.NAME, 'title')
+    elem.send_keys('Assignment submission from Mohamed')
+    elem = driver.find_element(By.NAME, 'attachment1')
+    elem.send_keys('/home/mrlan/Downloads/test/SeleniumHui/helper.py') # attach a file
+    elem = driver.find_element(By.XPATH, '//form/button')
+    time.sleep(3)
+    elem.click()
+
+    # Go the Submitted tab
+    elem = driver.find_element(By.ID, 'myTab')
+    elems = elem.find_elements(By.CLASS_NAME, 'nav-link')
+    elems[2].click()
+    time.sleep(3)
+
+    elem = driver.find_element(By.XPATH, '//div[@id="menu3"]/div')
+    assert 'Reading 2 (6 Marks)' in elem.text
+    assert 'SUBMITTED' in elem.text
+    assert 'helper.py' in elem.text
+
+
+def test_student_can_request_remarking(driver, url, restore_database):
+    # Student logs in
+    login(driver, url, '201825800050', '123')
+    driver.maximize_window()
+
+    # Enter into the course
+    elems = driver.find_elements(By.CLASS_NAME, 'btn-default')
+    elems[1].click()
+
+    # Go the Marked tab
+    elem = driver.find_element(By.ID, 'myTab')
+    elems = elem.find_elements(By.CLASS_NAME, 'nav-link')
+    elems[3].click()
+
+    # Send remarking request
+    remarking_buttons = driver.find_elements(By.CLASS_NAME, 'btn-light')
+    remarking_buttons[1].click()
+    alert = driver.switch_to.alert
+    alert.send_keys('I need higher marks, teacher.')
+    alert.accept()
+
+    elem = driver.find_element(By.XPATH, '//div[@id="menu4"]/div[2]/div/p/span')
+    assert 'Remarking request sent' == elem.text