Added JUnits & exception class