Added Lon and LonTest classes.