diff --git a/tests/test.cmp b/tests/test.cmp
index 2781c0e5..dc78fb9c 100644
--- a/tests/test.cmp
+++ b/tests/test.cmp
@@ -3493,7 +3493,7 @@ February 28
 2011/01/02 * * * * Dawn: 07:05
 2011/01/02 * * * * Sunrise: 07:39
 2011/01/02 * * * * Sunset: 16:27
-2011/01/02 * * * * Dusk: 17:01
+2011/01/02 * * * * Dusk: 17:00
 2011/01/03 * * * * Dawn: 07:05
 2011/01/03 * * * * Sunrise: 07:39
 2011/01/03 * * * * Sunset: 16:28
@@ -3537,7 +3537,7 @@ February 28
 2011/01/13 * * * * Dawn: 07:05
 2011/01/13 * * * * Sunrise: 07:37
 2011/01/13 * * * * Sunset: 16:38
-2011/01/13 * * * * Dusk: 17:13
+2011/01/13 * * * * Dusk: 17:12
 2011/01/14 * * * * Dawn: 07:05
 2011/01/14 * * * * Sunrise: 07:37
 2011/01/14 * * * * Sunset: 16:39
@@ -3589,7 +3589,7 @@ February 28
 2011/01/26 * * * * Dawn: 06:56
 2011/01/26 * * * * Sunrise: 07:30
 2011/01/26 * * * * Sunset: 16:55
-2011/01/26 * * * * Dusk: 17:29
+2011/01/26 * * * * Dusk: 17:28
 2011/01/27 * * * * Dawn: 06:56
 2011/01/27 * * * * Sunrise: 07:28
 2011/01/27 * * * * Sunset: 16:58
@@ -3601,7 +3601,7 @@ February 28
 2011/01/29 * * * * Dawn: 06:54
 2011/01/29 * * * * Sunrise: 07:26
 2011/01/29 * * * * Sunset: 17:00
-2011/01/29 * * * * Dusk: 17:32
+2011/01/29 * * * * Dusk: 17:31
 2011/01/30 * * * * Dawn: 06:54
 2011/01/30 * * * * Sunrise: 07:26
 2011/01/30 * * * * Sunset: 17:01
@@ -3660,7 +3660,7 @@ March 31
 2011/02/11 * * * * Sunrise: 07:11
 2011/02/11 * * * * Sunset: 17:19
 2011/02/11 * * * * Dusk: 17:50
-2011/02/12 * * * * Dawn: 06:37
+2011/02/12 * * * * Dawn: 06:39
 2011/02/12 * * * * Sunrise: 07:09
 2011/02/12 * * * * Sunset: 17:21
 2011/02/12 * * * * Dusk: 17:52
@@ -3738,7 +3738,7 @@ April 30
 2011/03/01 * * * * Sunrise: 06:41
 2011/03/01 * * * * Sunset: 17:45
 2011/03/01 * * * * Dusk: 18:15
-2011/03/02 * * * * Dawn: 06:09
+2011/03/02 * * * * Dawn: 06:11
 2011/03/02 * * * * Sunrise: 06:39
 2011/03/02 * * * * Sunset: 17:45
 2011/03/02 * * * * Dusk: 18:15
@@ -3868,7 +3868,7 @@ May 31
 2011/04/01 * * * * Sunrise: 05:43
 2011/04/01 * * * * Sunset: 18:25
 2011/04/01 * * * * Dusk: 18:55
-2011/04/02 * * * * Dawn: 05:11
+2011/04/02 * * * * Dawn: 05:13
 2011/04/02 * * * * Sunrise: 05:41
 2011/04/02 * * * * Sunset: 18:27
 2011/04/02 * * * * Dusk: 18:57
@@ -3944,7 +3944,7 @@ May 31
 2011/04/20 * * * * Sunrise: 05:09
 2011/04/20 * * * * Sunset: 18:50
 2011/04/20 * * * * Dusk: 19:22
-2011/04/21 * * * * Dawn: 04:35
+2011/04/21 * * * * Dawn: 04:37
 2011/04/21 * * * * Sunrise: 05:07
 2011/04/21 * * * * Sunset: 18:52
 2011/04/21 * * * * Dusk: 19:22
@@ -3971,7 +3971,7 @@ May 31
 2011/04/27 * * * * Dawn: 04:26
 2011/04/27 * * * * Sunrise: 04:58
 2011/04/27 * * * * Sunset: 18:59
-2011/04/27 * * * * Dusk: 19:31
+2011/04/27 * * * * Dusk: 19:30
 2011/04/28 * * * * Dawn: 04:24
 2011/04/28 * * * * Sunrise: 04:56
 2011/04/28 * * * * Sunset: 19:00
@@ -3997,7 +3997,7 @@ June 30
 2011/05/02 * * * * Dawn: 04:16
 2011/05/02 * * * * Sunrise: 04:50
 2011/05/02 * * * * Sunset: 19:06
-2011/05/02 * * * * Dusk: 19:38
+2011/05/02 * * * * Dusk: 19:37
 2011/05/03 * * * * Dawn: 04:16
 2011/05/03 * * * * Sunrise: 04:48
 2011/05/03 * * * * Sunset: 19:07
@@ -4006,7 +4006,7 @@ June 30
 2011/05/04 * * * * Sunrise: 04:47
 2011/05/04 * * * * Sunset: 19:07
 2011/05/04 * * * * Dusk: 19:40
-2011/05/05 * * * * Dawn: 04:11
+2011/05/05 * * * * Dawn: 04:13
 2011/05/05 * * * * Sunrise: 04:46
 2011/05/05 * * * * Sunset: 19:09
 2011/05/05 * * * * Dusk: 19:43
@@ -4029,7 +4029,7 @@ June 30
 2011/05/10 * * * * Dawn: 04:05
 2011/05/10 * * * * Sunrise: 04:39
 2011/05/10 * * * * Sunset: 19:15
-2011/05/10 * * * * Dusk: 19:50
+2011/05/10 * * * * Dusk: 19:49
 2011/05/11 * * * * Dawn: 04:03
 2011/05/11 * * * * Sunrise: 04:37
 2011/05/11 * * * * Sunset: 19:16
@@ -4041,7 +4041,7 @@ June 30
 2011/05/13 * * * * Dawn: 04:01
 2011/05/13 * * * * Sunrise: 04:35
 2011/05/13 * * * * Sunset: 19:19
-2011/05/13 * * * * Dusk: 19:53
+2011/05/13 * * * * Dusk: 19:52
 2011/05/14 * * * * Dawn: 03:59
 2011/05/14 * * * * Sunrise: 04:33
 2011/05/14 * * * * Sunset: 19:21
@@ -4050,10 +4050,10 @@ June 30
 2011/05/15 * * * * Sunrise: 04:31
 2011/05/15 * * * * Sunset: 19:22
 2011/05/15 * * * * Dusk: 19:55
-2011/05/16 * * * * Dawn: 03:56
+2011/05/16 * * * * Dawn: 03:57
 2011/05/16 * * * * Sunrise: 04:31
 2011/05/16 * * * * Sunset: 19:22
-2011/05/16 * * * * Dusk: 19:58
+2011/05/16 * * * * Dusk: 19:57
 2011/05/17 * * * * Dawn: 03:55
 2011/05/17 * * * * Sunrise: 04:30
 2011/05/17 * * * * Sunset: 19:23
@@ -4066,7 +4066,7 @@ June 30
 2011/05/19 * * * * Sunrise: 04:28
 2011/05/19 * * * * Sunset: 19:25
 2011/05/19 * * * * Dusk: 20:00
-2011/05/20 * * * * Dawn: 03:50
+2011/05/20 * * * * Dawn: 03:51
 2011/05/20 * * * * Sunrise: 04:26
 2011/05/20 * * * * Sunset: 19:28
 2011/05/20 * * * * Dusk: 20:02
@@ -4155,12 +4155,12 @@ July 31
 2011/06/09 * * * * Dawn: 03:34
 2011/06/09 * * * * Sunrise: 04:13
 2011/06/09 * * * * Sunset: 19:45
-2011/06/09 * * * * Dusk: 20:23
+2011/06/09 * * * * Dusk: 20:22
 2011/06/10 * * * * Dawn: 03:34
 2011/06/10 * * * * Sunrise: 04:11
 2011/06/10 * * * * Sunset: 19:46
 2011/06/10 * * * * Dusk: 20:23
-2011/06/11 * * * * Dawn: 03:33
+2011/06/11 * * * * Dawn: 03:34
 2011/06/11 * * * * Sunrise: 04:11
 2011/06/11 * * * * Sunset: 19:46
 2011/06/11 * * * * Dusk: 20:24
@@ -4180,11 +4180,11 @@ July 31
 2011/06/15 * * * * Sunrise: 04:11
 2011/06/15 * * * * Sunset: 19:50
 2011/06/15 * * * * Dusk: 20:27
-2011/06/16 * * * * Dawn: 03:32
+2011/06/16 * * * * Dawn: 03:33
 2011/06/16 * * * * Sunrise: 04:11
 2011/06/16 * * * * Sunset: 19:50
 2011/06/16 * * * * Dusk: 20:28
-2011/06/17 * * * * Dawn: 03:32
+2011/06/17 * * * * Dawn: 03:33
 2011/06/17 * * * * Sunrise: 04:11
 2011/06/17 * * * * Sunset: 19:51
 2011/06/17 * * * * Dusk: 20:28
@@ -4192,14 +4192,14 @@ July 31
 2011/06/18 * * * * Sunrise: 04:11
 2011/06/18 * * * * Sunset: 19:51
 2011/06/18 * * * * Dusk: 20:29
-2011/06/19 * * * * Dawn: 03:32
+2011/06/19 * * * * Dawn: 03:33
 2011/06/19 * * * * Sunrise: 04:11
 2011/06/19 * * * * Sunset: 19:51
 2011/06/19 * * * * Dusk: 20:29
-2011/06/20 * * * * Dawn: 03:32
+2011/06/20 * * * * Dawn: 03:33
 2011/06/20 * * * * Sunrise: 04:11
 2011/06/20 * * * * Sunset: 19:52
-2011/06/20 * * * * Dusk: 20:30
+2011/06/20 * * * * Dusk: 20:29
 2011/06/21 * * * * Dawn: 03:33
 2011/06/21 * * * * Sunrise: 04:11
 2011/06/21 * * * * Sunset: 19:52
@@ -4273,7 +4273,7 @@ August 31
 2011/07/07 * * * * Dawn: 03:41
 2011/07/07 * * * * Sunrise: 04:18
 2011/07/07 * * * * Sunset: 19:51
-2011/07/07 * * * * Dusk: 20:29
+2011/07/07 * * * * Dusk: 20:28
 2011/07/08 * * * * Dawn: 03:42
 2011/07/08 * * * * Sunrise: 04:18
 2011/07/08 * * * * Sunset: 19:51
@@ -4281,7 +4281,7 @@ August 31
 2011/07/09 * * * * Dawn: 03:43
 2011/07/09 * * * * Sunrise: 04:20
 2011/07/09 * * * * Sunset: 19:50
-2011/07/09 * * * * Dusk: 20:28
+2011/07/09 * * * * Dusk: 20:27
 2011/07/10 * * * * Dawn: 03:44
 2011/07/10 * * * * Sunrise: 04:20
 2011/07/10 * * * * Sunset: 19:50
@@ -4305,7 +4305,7 @@ August 31
 2011/07/15 * * * * Dawn: 03:47
 2011/07/15 * * * * Sunrise: 04:24
 2011/07/15 * * * * Sunset: 19:46
-2011/07/15 * * * * Dusk: 20:23
+2011/07/15 * * * * Dusk: 20:22
 2011/07/16 * * * * Dawn: 03:48
 2011/07/16 * * * * Sunrise: 04:26
 2011/07/16 * * * * Sunset: 19:45
@@ -4349,7 +4349,7 @@ August 31
 2011/07/26 * * * * Dawn: 04:01
 2011/07/26 * * * * Sunrise: 04:35
 2011/07/26 * * * * Sunset: 19:37
-2011/07/26 * * * * Dusk: 20:13
+2011/07/26 * * * * Dusk: 20:12
 2011/07/27 * * * * Dawn: 04:01
 2011/07/27 * * * * Sunrise: 04:37
 2011/07/27 * * * * Sunset: 19:36
@@ -4396,7 +4396,7 @@ September 30
 2011/08/05 * * * * Sunrise: 04:47
 2011/08/05 * * * * Sunset: 19:24
 2011/08/05 * * * * Dusk: 19:59
-2011/08/06 * * * * Dawn: 04:13
+2011/08/06 * * * * Dawn: 04:15
 2011/08/06 * * * * Sunrise: 04:48
 2011/08/06 * * * * Sunset: 19:23
 2011/08/06 * * * * Dusk: 19:58
@@ -4407,7 +4407,7 @@ September 30
 2011/08/08 * * * * Dawn: 04:16
 2011/08/08 * * * * Sunrise: 04:50
 2011/08/08 * * * * Sunset: 19:21
-2011/08/08 * * * * Dusk: 19:54
+2011/08/08 * * * * Dusk: 19:53
 2011/08/09 * * * * Dawn: 04:18
 2011/08/09 * * * * Sunrise: 04:52
 2011/08/09 * * * * Sunset: 19:20
@@ -4496,7 +4496,7 @@ September 30
 2011/08/30 * * * * Sunrise: 05:16
 2011/08/30 * * * * Sunset: 18:45
 2011/08/30 * * * * Dusk: 19:15
-2011/08/31 * * * * Dawn: 04:47
+2011/08/31 * * * * Dawn: 04:48
 2011/08/31 * * * * Sunrise: 05:18
 2011/08/31 * * * * Sunset: 18:43
 2011/08/31 * * * * Dusk: 19:14
@@ -4537,7 +4537,7 @@ October 31
 2011/09/08 * * * * Dawn: 04:58
 2011/09/08 * * * * Sunrise: 05:28
 2011/09/08 * * * * Sunset: 18:28
-2011/09/08 * * * * Dusk: 18:59
+2011/09/08 * * * * Dusk: 18:58
 2011/09/09 * * * * Dawn: 04:58
 2011/09/09 * * * * Sunrise: 05:28
 2011/09/09 * * * * Sunset: 18:25
@@ -4621,7 +4621,7 @@ October 31
 2011/09/29 * * * * Dawn: 05:24
 2011/09/29 * * * * Sunrise: 05:54
 2011/09/29 * * * * Sunset: 17:47
-2011/09/29 * * * * Dusk: 18:17
+2011/09/29 * * * * Dusk: 18:16
 2011/09/30 * * * * Dawn: 05:24
 2011/09/30 * * * * Sunrise: 05:54
 2011/09/30 * * * * Sunset: 17:45
@@ -4676,14 +4676,14 @@ November 30
 2011/10/11 * * * * Sunrise: 06:09
 2011/10/11 * * * * Sunset: 17:24
 2011/10/11 * * * * Dusk: 17:54
-2011/10/12 * * * * Dawn: 05:39
+2011/10/12 * * * * Dawn: 05:41
 2011/10/12 * * * * Sunrise: 06:09
 2011/10/12 * * * * Sunset: 17:23
 2011/10/12 * * * * Dusk: 17:52
 2011/10/13 * * * * Dawn: 05:41
 2011/10/13 * * * * Sunrise: 06:11
 2011/10/13 * * * * Sunset: 17:22
-2011/10/13 * * * * Dusk: 17:52
+2011/10/13 * * * * Dusk: 17:51
 2011/10/14 * * * * Dawn: 05:43
 2011/10/14 * * * * Sunrise: 06:13
 2011/10/14 * * * * Sunset: 17:20
@@ -4711,7 +4711,7 @@ November 30
 2011/10/20 * * * * Dawn: 05:50
 2011/10/20 * * * * Sunrise: 06:20
 2011/10/20 * * * * Sunset: 17:08
-2011/10/20 * * * * Dusk: 17:39
+2011/10/20 * * * * Dusk: 17:38
 2011/10/21 * * * * Dawn: 05:52
 2011/10/21 * * * * Sunrise: 06:22
 2011/10/21 * * * * Sunset: 17:07
@@ -4801,8 +4801,8 @@ December 31
 2011/11/10 * * * * Dawn: 06:18
 2011/11/10 * * * * Sunrise: 06:50
 2011/11/10 * * * * Sunset: 16:37
-2011/11/10 * * * * Dusk: 17:09
-2011/11/11 * * * * Dawn: 06:18
+2011/11/10 * * * * Dusk: 17:08
+2011/11/11 * * * * Dawn: 06:20
 2011/11/11 * * * * Sunrise: 06:50
 2011/11/11 * * * * Sunset: 16:37
 2011/11/11 * * * * Dusk: 17:07
@@ -4900,7 +4900,7 @@ January 31
 2011/12/03 * * * * Sunrise: 07:20
 2011/12/03 * * * * Sunset: 16:19
 2011/12/03 * * * * Dusk: 16:52
-2011/12/04 * * * * Dawn: 06:47
+2011/12/04 * * * * Dawn: 06:48
 2011/12/04 * * * * Sunrise: 07:20
 2011/12/04 * * * * Sunset: 16:17
 2011/12/04 * * * * Dusk: 16:52
@@ -4924,7 +4924,7 @@ January 31
 2011/12/09 * * * * Sunrise: 07:26
 2011/12/09 * * * * Sunset: 16:16
 2011/12/09 * * * * Dusk: 16:51
-2011/12/10 * * * * Dawn: 06:52
+2011/12/10 * * * * Dawn: 06:54
 2011/12/10 * * * * Sunrise: 07:26
 2011/12/10 * * * * Sunset: 16:16
 2011/12/10 * * * * Dusk: 16:51
@@ -4987,7 +4987,7 @@ January 31
 2011/12/25 * * * * Dawn: 07:03
 2011/12/25 * * * * Sunrise: 07:37
 2011/12/25 * * * * Sunset: 16:21
-2011/12/25 * * * * Dusk: 16:55
+2011/12/25 * * * * Dusk: 16:54
 2011/12/26 * * * * Dawn: 07:03
 2011/12/26 * * * * Sunrise: 07:37
 2011/12/26 * * * * Sunset: 16:22