Added Class and Test