Addition of Test Class and minor addition