Updated class level comment and fixed Unit Test