Commented Junit test class and minor changes