Modified class and Test added