Fixing require issue (test cases are still reporting errors but the test cases need to be updated)