Fixed remaining Classes and tested using Main Class