Changed deprecated Date to use of Calendar. Added comments to test author