Fixed merge errors by updating the class path and fixing the Test Cases