Added new classes and JUnits