diff --git a/test_maya.py b/test_maya.py
index 32a00cc..c9b7678 100644
--- a/test_maya.py
+++ b/test_maya.py
@@ -49,14 +49,30 @@ def test_dt_tz_naive():
 
 
 def test_random_date():
-    d = maya.when('11-17-11 08:09:10')
-    assert d.year == 2011
-    assert d.month == 11
-    assert d.day == 17
-    assert d.hour == 8
-    assert d.minute == 9
-    assert d.second == 10
-    assert d.microsecond == 0
+
+    # Test properties for maya.when()
+    d1 = maya.when('11-17-11 08:09:10')
+    assert d1.year == 2011
+    assert d1.month == 11
+    assert d1.day == 17
+    assert d1.week == 46
+    assert d1.weekday == 4
+    assert d1.hour == 8
+    assert d1.minute == 9
+    assert d1.second == 10
+    assert d1.microsecond == 0
+
+    # Test properties for maya.parse()
+    d2 = maya.parse('February 29, 1992 13:12:34')
+    assert d2.year == 1992
+    assert d2.month == 2
+    assert d2.day == 29
+    assert d2.week == 9
+    assert d2.weekday == 6
+    assert d2.hour == 13
+    assert d2.minute == 12
+    assert d2.second == 34
+    assert d2.microsecond == 0
 
 
 def test_print_date(capsys):
@@ -120,19 +136,3 @@ def test_comparison_operations():
 
     assert (now >= now_copy) is True
     assert (now >= tomorrow) is False
-
-
-def test_weekday():
-    dt = maya.parse('February 21, 1994')
-    assert dt.weekday == 1  # was a Monday
-
-    dt = maya.parse('February 29, 1992')
-    assert dt.weekday == 6  # was a Saturday
-
-
-def test_week():
-    dt = maya.parse('February 21, 1994')
-    assert dt.week == 8
-
-    dt = maya.parse('May 29, 1992')
-    assert dt.week == 22