refactoring in Course module, added more junit test to course module