CourseNames in CourseLists fix

course names in course lists should be displayed now correctly. Fixing
some Source Testcases. Refactoring