diff --git a/tests/testthat/test-accessors-date.R b/tests/testthat/test-accessors-date.R
new file mode 100644
index 00000000..183643cc
--- /dev/null
+++ b/tests/testthat/test-accessors-date.R
@@ -0,0 +1,59 @@
+context("Settors")
+
+test_that("dates settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  date(poslt) <- as.Date("2000-01-01")
+  date(posct) <- as.Date("2000-01-01")
+  date(date) <- as.Date("2000-01-01")
+
+  expect_equal(date(poslt), as.Date("2000-01-01"))
+  expect_equal(date(posct), as.Date("2000-01-01"))
+  expect_equal(date(date), as.Date("2000-01-01"))
+})
+
+test_that("dates settor does not change time zone", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  date(poslt) <- as.Date("2000-01-01")
+  date(posct) <- as.Date("2000-01-01")
+  date(date) <- as.Date("2000-01-01")
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("dates settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2009-03-14 02:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  poslt <- force_tz(poslt, tzone = "America/New_York")
+  posct <- as.POSIXct(poslt)
+
+  date(poslt) <- as.Date("2010-03-14")
+  date(posct) <- as.Date("2010-03-14")
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posct))
+})
+
+test_that("dates settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  date(poslt) <- as.Date("2000-01-01")
+  date(posct) <- as.Date("2000-01-01")
+  date(date) <- as.Date("2000-01-01")
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+})
diff --git a/tests/testthat/test-accessors-day.R b/tests/testthat/test-accessors-day.R
new file mode 100644
index 00000000..02243bd0
--- /dev/null
+++ b/tests/testthat/test-accessors-day.R
@@ -0,0 +1,382 @@
+context("Settors")
+
+
+test_that("mdays settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  mday(poslt) <- 10
+  mday(posct) <- 10
+  mday(date) <- 10
+
+  expect_equal(mday(poslt), 10)
+  expect_equal(mday(posct), 10)
+  expect_equal(mday(date), 10)
+
+  expect_equal(yday(poslt), 41)
+  expect_equal(yday(posct), 41)
+  expect_equal(yday(date), 41)
+
+  expect_equal(wday(poslt), 4)
+  expect_equal(wday(posct), 4)
+  expect_equal(wday(date), 4)
+
+})
+
+test_that("mdays settor rolls over as expected", {
+  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  mday(poslt) <- 32
+  mday(posct) <- 32
+  mday(date) <- 32
+
+  expect_equal(second(poslt), 59)
+  expect_equal(minute(poslt), 59)
+  expect_equal(hour(poslt), 23)
+  expect_equal(mday(poslt), 1)
+  expect_equal(wday(poslt), 7)
+  expect_equal(yday(poslt), 1)
+  expect_equal(month(poslt), 1)
+  expect_equal(year(poslt), 2011)
+  expect_equal(tz(poslt), "UTC")
+
+  expect_equal(second(posct), 59)
+  expect_equal(minute(posct), 59)
+  expect_equal(hour(posct), 23)
+  expect_equal(mday(posct), 1)
+  expect_equal(wday(posct), 7)
+  expect_equal(yday(posct), 1)
+  expect_equal(month(posct), 1)
+  expect_equal(year(posct), 2011)
+  expect_equal(tz(posct), "UTC")
+
+  expect_equal(second(date), 0)
+  expect_equal(minute(date), 0)
+  expect_equal(hour(date), 0)
+  expect_equal(mday(date), 1)
+  expect_equal(wday(date), 7)
+  expect_equal(yday(date), 1)
+  expect_equal(month(date), 1)
+  expect_equal(year(date), 2011)
+  expect_equal(tz(date), "UTC")
+
+})
+
+test_that("mdays settor does not change time zone", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  mday(poslt) <- 1
+  mday(posct) <- 1
+  mday(date) <- 1
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+
+  mday(poslt) <- 32
+  mday(posct) <- 32
+  mday(date) <- 32
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("mdays settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2010-03-13 02:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  poslt <- force_tz(poslt, tzone = "America/New_York")
+  posct <- as.POSIXct(poslt)
+
+  mday(poslt) <- 14
+  mday(posct) <- 14
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posct))
+
+})
+
+test_that("mdays settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  mday(poslt) <- 3
+  mday(posct) <- 3
+  mday(date) <- 3
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+  mday(poslt) <- 32
+  mday(posct) <- 32
+  mday(date) <- 32
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+})
+
+test_that("ydays settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  yday(poslt) <- 41
+  yday(posct) <- 41
+  yday(date) <- 41
+
+  expect_equal(yday(poslt), 41)
+  expect_equal(yday(posct), 41)
+  expect_equal(yday(date), 41)
+
+  expect_equal(mday(poslt), 10)
+  expect_equal(mday(posct), 10)
+  expect_equal(mday(date), 10)
+
+  expect_equal(wday(poslt), 4)
+  expect_equal(wday(posct), 4)
+  expect_equal(wday(date), 4)
+})
+
+test_that("ydays settor rolls over as expected", {
+  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  yday(poslt) <- 366
+  yday(posct) <- 366
+  yday(date) <- 366
+
+  expect_equal(second(poslt), 59)
+  expect_equal(minute(poslt), 59)
+  expect_equal(hour(poslt), 23)
+  expect_equal(mday(poslt), 1)
+  expect_equal(wday(poslt), 7)
+  expect_equal(yday(poslt), 1)
+  expect_equal(month(poslt), 1)
+  expect_equal(year(poslt), 2011)
+  expect_equal(tz(poslt), "UTC")
+
+  expect_equal(second(posct), 59)
+  expect_equal(minute(posct), 59)
+  expect_equal(hour(posct), 23)
+  expect_equal(mday(posct), 1)
+  expect_equal(wday(posct), 7)
+  expect_equal(yday(posct), 1)
+  expect_equal(month(posct), 1)
+  expect_equal(year(posct), 2011)
+  expect_equal(tz(posct), "UTC")
+
+  expect_equal(second(date), 0)
+  expect_equal(minute(date), 0)
+  expect_equal(hour(date), 0)
+  expect_equal(mday(date), 1)
+  expect_equal(wday(date), 7)
+  expect_equal(yday(date), 1)
+  expect_equal(month(date), 1)
+  expect_equal(year(date), 2011)
+  expect_equal(tz(date), "UTC")
+
+})
+
+test_that("ydays settor does not change time zone", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  yday(poslt) <- 1
+  yday(posct) <- 1
+  yday(date) <- 1
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+
+  yday(poslt) <- 366
+  yday(posct) <- 366
+  yday(date) <- 366
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("ydays settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2010-03-13 02:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  poslt <- force_tz(poslt, tzone = "America/New_York")
+  posct <- as.POSIXct(poslt)
+
+  yday(poslt) <- 73
+  yday(posct) <- 73
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posct))
+
+})
+
+test_that("ydays settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  yday(poslt) <- 3
+  yday(posct) <- 3
+  yday(date) <- 3
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+  yday(poslt) <- 366
+  yday(posct) <- 366
+  yday(date) <- 366
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+})
+
+test_that("wdays settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  wday(poslt) <- 5
+  wday(posct) <- 5
+  wday(date) <- 5
+
+  expect_equal(wday(poslt), 5)
+  expect_equal(wday(posct), 5)
+  expect_equal(wday(date), 5)
+
+  expect_equal(mday(poslt), 4)
+  expect_equal(mday(posct), 4)
+  expect_equal(mday(date), 4)
+
+  expect_equal(mday(poslt), 4)
+  expect_equal(mday(posct), 4)
+  expect_equal(mday(date), 4)
+
+})
+
+test_that("wdays settor rolls over as expected", {
+  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  wday(poslt) <- 8
+  wday(posct) <- 8
+  wday(date) <- 8
+
+  expect_equal(second(poslt), 59)
+  expect_equal(minute(poslt), 59)
+  expect_equal(hour(poslt), 23)
+  expect_equal(mday(poslt), 2)
+  expect_equal(wday(poslt), 1)
+  expect_equal(yday(poslt), 2)
+  expect_equal(month(poslt), 1)
+  expect_equal(year(poslt), 2011)
+  expect_equal(tz(poslt), "UTC")
+
+  expect_equal(second(posct), 59)
+  expect_equal(minute(posct), 59)
+  expect_equal(hour(posct), 23)
+  expect_equal(mday(posct), 2)
+  expect_equal(wday(posct), 1)
+  expect_equal(yday(posct), 2)
+  expect_equal(month(posct), 1)
+  expect_equal(year(posct), 2011)
+  expect_equal(tz(posct), "UTC")
+
+  expect_equal(second(date), 0)
+  expect_equal(minute(date), 0)
+  expect_equal(hour(date), 0)
+  expect_equal(mday(date), 2)
+  expect_equal(wday(date), 1)
+  expect_equal(yday(date), 2)
+  expect_equal(month(date), 1)
+  expect_equal(year(date), 2011)
+  expect_equal(tz(date), "UTC")
+
+})
+
+test_that("wdays settor does not change time zone", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  wday(poslt) <- 2
+  wday(posct) <- 2
+  wday(date) <- 2
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+
+  wday(poslt) <- 8
+  wday(posct) <- 8
+  wday(date) <- 8
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("wdays settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2010-03-13 02:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  poslt <- force_tz(poslt, tzone = "America/New_York")
+  posct <- as.POSIXct(poslt)
+
+  wday(poslt) <- 8
+  wday(posct) <- 8
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posct))
+
+})
+
+test_that("wdays settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  wday(poslt) <- 3
+  wday(posct) <- 3
+  wday(date) <- 3
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+  wday(poslt) <- 8
+  wday(posct) <- 8
+  wday(date) <- 8
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+})
diff --git a/tests/testthat/test-accessors-hour.R b/tests/testthat/test-accessors-hour.R
new file mode 100644
index 00000000..418a93cf
--- /dev/null
+++ b/tests/testthat/test-accessors-hour.R
@@ -0,0 +1,118 @@
+context("Settors")
+
+test_that("hours settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  hour(poslt) <- 10
+  hour(posct) <- 10
+  hour(date) <- 10
+
+  expect_equal(hour(poslt), 10)
+  expect_equal(hour(posct), 10)
+  expect_equal(hour(date), 10)
+
+})
+
+test_that("hours settor rolls over as expected", {
+  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  hour(poslt) <- 25
+  hour(posct) <- 25
+  hour(date) <- 25
+
+  expect_equal(second(poslt), 59)
+  expect_equal(minute(poslt), 59)
+  expect_equal(hour(poslt), 1)
+  expect_equal(mday(poslt), 1)
+  expect_equal(wday(poslt), 7)
+  expect_equal(yday(poslt), 1)
+  expect_equal(month(poslt), 1)
+  expect_equal(year(poslt), 2011)
+  expect_equal(tz(poslt), "UTC")
+
+  expect_equal(second(posct), 59)
+  expect_equal(minute(posct), 59)
+  expect_equal(hour(posct), 1)
+  expect_equal(mday(posct), 1)
+  expect_equal(wday(posct), 7)
+  expect_equal(yday(posct), 1)
+  expect_equal(month(posct), 1)
+  expect_equal(year(posct), 2011)
+  expect_equal(tz(posct), "UTC")
+
+  expect_equal(second(date), 0)
+  expect_equal(minute(date), 0)
+  expect_equal(hour(date), 1)
+  expect_equal(mday(date), 1)
+  expect_equal(wday(date), 7)
+  expect_equal(yday(date), 1)
+  expect_equal(month(date), 01)
+  expect_equal(year(date), 2011)
+  expect_equal(tz(date), "UTC")
+
+})
+
+test_that("hours settor does not change time zone", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  hour(poslt) <- 1
+  hour(posct) <- 1
+  hour(date) <- 1
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+
+  hour(poslt) <- 70
+  hour(posct) <- 70
+  hour(date) <- 70
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("hours settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2010-03-14 01:59:59", tz = "UTC", format = "%Y-%m-%d %H:%M:%S")
+  poslt <- force_tz(poslt, tzone = "America/New_York")
+  posct <- as.POSIXct(poslt)
+
+  hour(poslt) <- 2
+  hour(posct) <- 2
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posct))
+
+})
+
+test_that("hours settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  hour(poslt) <- 2
+  hour(posct) <- 2
+  hour(date) <- 2
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "POSIXlt")
+
+  hour(poslt) <- 25
+  hour(posct) <- 25
+  hour(date) <- 25
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "POSIXlt")
+
+})
diff --git a/tests/testthat/test-accessors-minute.R b/tests/testthat/test-accessors-minute.R
new file mode 100644
index 00000000..95f38851
--- /dev/null
+++ b/tests/testthat/test-accessors-minute.R
@@ -0,0 +1,120 @@
+context("Settors")
+
+test_that("minutes settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  minute(poslt) <- 10
+  minute(posct) <- 10
+  minute(date) <- 10
+
+  expect_equal(minute(poslt), 10)
+  expect_equal(minute(posct), 10)
+  expect_equal(minute(date), 10)
+
+})
+
+test_that("minutes settor rolls over as expected", {
+  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  minute(poslt) <- 69
+  minute(posct) <- 69
+  minute(date) <- 69
+
+  expect_equal(second(poslt), 59)
+  expect_equal(minute(poslt), 9)
+  expect_equal(hour(poslt), 0)
+  expect_equal(mday(poslt), 1)
+  expect_equal(wday(poslt), 7)
+  expect_equal(yday(poslt), 1)
+  expect_equal(month(poslt), 1)
+  expect_equal(year(poslt), 2011)
+  expect_equal(tz(poslt), "UTC")
+
+  expect_equal(second(posct), 59)
+  expect_equal(minute(posct), 9)
+  expect_equal(hour(posct), 0)
+  expect_equal(mday(posct), 1)
+  expect_equal(wday(posct), 7)
+  expect_equal(yday(posct), 1)
+  expect_equal(month(posct), 1)
+  expect_equal(year(posct), 2011)
+  expect_equal(tz(posct), "UTC")
+
+  expect_equal(second(date), 0)
+  expect_equal(minute(date), 9)
+  expect_equal(hour(date), 1)
+  expect_equal(mday(date), 31)
+  expect_equal(wday(date), 6)
+  expect_equal(yday(date), 365)
+  expect_equal(month(date), 12)
+  expect_equal(year(date), 2010)
+  expect_equal(tz(date), "UTC")
+
+})
+
+test_that("minutes settor does not change time zone", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  minute(poslt) <- 1
+  minute(posct) <- 1
+  minute(date) <- 1
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+
+  minute(poslt) <- 70
+  minute(posct) <- 70
+  minute(date) <- 70
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("minutes settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2010-03-14 01:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  poslt <- force_tz(poslt, tzone = "America/New_York")
+  posct <- as.POSIXct(poslt)
+
+  minute(poslt) <- 70
+  minute(posct) <- 70
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posct))
+
+})
+
+test_that("minutes settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  minute(poslt) <- 1
+  minute(posct) <- 1
+  minute(date) <- 1
+
+  expect_is("minute<-"(poslt, 1), "POSIXlt")
+  expect_is("minute<-"(posct, 1), "POSIXct")
+  expect_is("minute<-"(date, 1), "POSIXlt")
+
+  minute(poslt) <- 70
+  minute(posct) <- 70
+  minute(date) <- 70
+
+  expect_is("minute<-"(poslt, 70), "POSIXlt")
+  expect_is("minute<-"(posct, 70), "POSIXct")
+  expect_is("minute<-"(date, 70), "POSIXlt")
+
+})
diff --git a/tests/testthat/test-accessors-month.R b/tests/testthat/test-accessors-month.R
new file mode 100644
index 00000000..cbc5b253
--- /dev/null
+++ b/tests/testthat/test-accessors-month.R
@@ -0,0 +1,118 @@
+context("Settors")
+
+test_that("months settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  month(poslt) <- 5
+  month(posct) <- 5
+  month(date) <- 5
+
+  expect_equal(month(poslt), 5)
+  expect_equal(month(posct), 5)
+  expect_equal(month(date), 5)
+})
+
+test_that("months settor rolls over as expected", {
+  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  month(poslt) <- 13
+  month(posct) <- 13
+  month(date) <- 13
+
+  expect_equal(second(poslt), 59)
+  expect_equal(minute(poslt), 59)
+  expect_equal(hour(poslt), 23)
+  expect_equal(mday(poslt), 31)
+  expect_equal(wday(poslt), 2)
+  expect_equal(yday(poslt), 31)
+  expect_equal(month(poslt), 1)
+  expect_equal(year(poslt), 2011)
+  expect_equal(tz(poslt), "UTC")
+
+  expect_equal(second(posct), 59)
+  expect_equal(minute(posct), 59)
+  expect_equal(hour(posct), 23)
+  expect_equal(mday(posct), 31)
+  expect_equal(wday(posct), 2)
+  expect_equal(yday(posct), 31)
+  expect_equal(month(posct), 1)
+  expect_equal(year(posct), 2011)
+  expect_equal(tz(posct), "UTC")
+
+  expect_equal(second(date), 0)
+  expect_equal(minute(date), 0)
+  expect_equal(hour(date), 0)
+  expect_equal(mday(date), 31)
+  expect_equal(wday(date), 2)
+  expect_equal(yday(date), 31)
+  expect_equal(month(date), 1)
+  expect_equal(year(date), 2011)
+  expect_equal(tz(date), "UTC")
+
+})
+
+test_that("months settor does not change time zone", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  month(poslt) <- 1
+  month(posct) <- 1
+  month(date) <- 1
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+
+  month(poslt) <- 13
+  month(posct) <- 13
+  month(date) <- 13
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("months settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2010-02-14 02:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  poslt <- force_tz(poslt, tzone = "America/New_York")
+  posct <- as.POSIXct(poslt)
+
+  month(poslt) <- 3
+  month(posct) <- 3
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posct))
+})
+
+test_that("months settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  month(poslt) <- 1
+  month(posct) <- 1
+  month(date) <- 1
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+  month(poslt) <- 13
+  month(posct) <- 13
+  month(date) <- 13
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+})
diff --git a/tests/testthat/test-accessors-second.R b/tests/testthat/test-accessors-second.R
new file mode 100644
index 00000000..70d291ef
--- /dev/null
+++ b/tests/testthat/test-accessors-second.R
@@ -0,0 +1,120 @@
+context("Settors")
+
+test_that("seconds settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  second(poslt) <- 10
+  second(posct) <- 10
+  second(date) <- 10
+
+  expect_equal(second(poslt), 10)
+  expect_equal(second(posct), 10)
+  expect_equal(second(date), 10)
+
+})
+
+test_that("seconds settor rolls over as expected", {
+  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  second(poslt) <- 69
+  second(posct) <- 69
+  second(date) <- 69
+
+  expect_equal(second(poslt), 9)
+  expect_equal(minute(poslt), 0)
+  expect_equal(hour(poslt), 0)
+  expect_equal(mday(poslt), 1)
+  expect_equal(wday(poslt), 7)
+  expect_equal(yday(poslt), 1)
+  expect_equal(month(poslt), 1)
+  expect_equal(year(poslt), 2011)
+  expect_equal(tz(poslt), "UTC")
+
+  expect_equal(second(posct), 9)
+  expect_equal(minute(posct), 0)
+  expect_equal(hour(posct), 0)
+  expect_equal(mday(posct), 1)
+  expect_equal(wday(posct), 7)
+  expect_equal(yday(posct), 1)
+  expect_equal(month(posct), 1)
+  expect_equal(year(posct), 2011)
+  expect_equal(tz(posct), "UTC")
+
+  expect_equal(second(date), 9)
+  expect_equal(minute(date), 1)
+  expect_equal(hour(date), 0)
+  expect_equal(mday(date), 31)
+  expect_equal(wday(date), 6)
+  expect_equal(yday(date), 365)
+  expect_equal(month(date), 12)
+  expect_equal(year(date), 2010)
+  expect_equal(tz(date), "UTC")
+
+})
+
+test_that("seconds settor does not change time zone", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  second(poslt) <- 1
+  second(posct) <- 1
+  second(date) <- 1
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+
+  second(poslt) <- 69
+  second(posct) <- 69
+  second(date) <- 69
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("seconds settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2010-03-14 01:59:59", tz = "UTC", format = "%Y-%m-%d %H:%M:%S")
+  poslt <- force_tz(poslt, tzone = "America/New_York")
+  posxct <- as.POSIXct(poslt)
+
+  second(poslt) <- 69
+  second(posxct) <- 69
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posxct))
+
+})
+
+test_that("seconds settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  second(poslt) <- 10
+  second(posct) <- 10
+  day(date) <- 10
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+  second(poslt) <- 70
+  second(posct) <- 70
+  day(date) <- 32
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+
+})
+
diff --git a/tests/testthat/test-accessors-year.R b/tests/testthat/test-accessors-year.R
new file mode 100644
index 00000000..e0e28ba4
--- /dev/null
+++ b/tests/testthat/test-accessors-year.R
@@ -0,0 +1,60 @@
+context("Settors")
+
+test_that("years settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  year(poslt) <- 2000
+  year(posct) <- 2000
+  year(date) <- 2000
+
+  expect_equal(year(poslt), 2000)
+  expect_equal(year(posct), 2000)
+  expect_equal(year(date), 2000)
+})
+
+test_that("years settor does not change time zone", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  year(poslt) <- 2000
+  year(posct) <- 2000
+  year(date) <- 2000
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("years settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2009-03-14 02:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  poslt <- force_tz(poslt, tzone = "America/New_York")
+  posct <- as.POSIXct(poslt)
+
+  year(poslt) <- 2010
+  year(posct) <- 2010
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posct))
+
+})
+
+test_that("years settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  year(poslt) <- 2000
+  year(posct) <- 2000
+  year(date) <- 2000
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+})
diff --git a/tests/testthat/test-settors.R b/tests/testthat/test-settors.R
index 69b7a6b9..680d8010 100644
--- a/tests/testthat/test-settors.R
+++ b/tests/testthat/test-settors.R
@@ -1,365 +1,5 @@
 context("Settors")
 
-test_that("seconds settor correctly performs simple updates", {
-  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  second(poslt) <- 10
-  second(posct) <- 10
-  second(date) <- 10
-
-  expect_equal(second(poslt), 10)
-  expect_equal(second(posct), 10)
-  expect_equal(second(date), 10)
-
-})
-
-test_that("seconds settor rolls over as expected", {
-  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  second(poslt) <- 69
-  second(posct) <- 69
-  second(date) <- 69
-
-  expect_equal(second(poslt), 9)
-  expect_equal(minute(poslt), 0)
-  expect_equal(hour(poslt), 0)
-  expect_equal(mday(poslt), 1)
-  expect_equal(wday(poslt), 7)
-  expect_equal(yday(poslt), 1)
-  expect_equal(month(poslt), 1)
-  expect_equal(year(poslt), 2011)
-  expect_equal(tz(poslt), "UTC")
-
-  expect_equal(second(posct), 9)
-  expect_equal(minute(posct), 0)
-  expect_equal(hour(posct), 0)
-  expect_equal(mday(posct), 1)
-  expect_equal(wday(posct), 7)
-  expect_equal(yday(posct), 1)
-  expect_equal(month(posct), 1)
-  expect_equal(year(posct), 2011)
-  expect_equal(tz(posct), "UTC")
-
-  expect_equal(second(date), 9)
-  expect_equal(minute(date), 1)
-  expect_equal(hour(date), 0)
-  expect_equal(mday(date), 31)
-  expect_equal(wday(date), 6)
-  expect_equal(yday(date), 365)
-  expect_equal(month(date), 12)
-  expect_equal(year(date), 2010)
-  expect_equal(tz(date), "UTC")
-
-})
-
-test_that("seconds settor does not change time zone", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  second(poslt) <- 1
-  second(posct) <- 1
-  second(date) <- 1
-
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-
-  second(poslt) <- 69
-  second(posct) <- 69
-  second(date) <- 69
-
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-})
-
-
-test_that("seconds settor returns NA for spring dst gap", {
-  poslt <- as.POSIXlt("2010-03-14 01:59:59", tz = "UTC", format = "%Y-%m-%d %H:%M:%S")
-  poslt <- force_tz(poslt, tzone = "America/New_York")
-  posxct <- as.POSIXct(poslt)
-
-  second(poslt) <- 69
-  second(posxct) <- 69
-
-  expect_true(is.na(poslt))
-  expect_true(is.na(posxct))
-
-})
-
-test_that("seconds settor retains object class", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  second(poslt) <- 10
-  second(posct) <- 10
-  day(date) <- 10
-
-  expect_is(poslt, "POSIXlt")
-  expect_is(posct, "POSIXct")
-  expect_is(date, "Date")
-
-  second(poslt) <- 70
-  second(posct) <- 70
-  day(date) <- 32
-
-  expect_is(poslt, "POSIXlt")
-  expect_is(posct, "POSIXct")
-  expect_is(date, "Date")
-
-})
-
-
-
-test_that("minutes settor correctly performs simple updates", {
-  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  minute(poslt) <- 10
-  minute(posct) <- 10
-  minute(date) <- 10
-
-  expect_equal(minute(poslt), 10)
-  expect_equal(minute(posct), 10)
-  expect_equal(minute(date), 10)
-
-})
-
-test_that("minutes settor rolls over as expected", {
-  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  minute(poslt) <- 69
-  minute(posct) <- 69
-  minute(date) <- 69
-
-  expect_equal(second(poslt), 59)
-  expect_equal(minute(poslt), 9)
-  expect_equal(hour(poslt), 0)
-  expect_equal(mday(poslt), 1)
-  expect_equal(wday(poslt), 7)
-  expect_equal(yday(poslt), 1)
-  expect_equal(month(poslt), 1)
-  expect_equal(year(poslt), 2011)
-  expect_equal(tz(poslt), "UTC")
-
-  expect_equal(second(posct), 59)
-  expect_equal(minute(posct), 9)
-  expect_equal(hour(posct), 0)
-  expect_equal(mday(posct), 1)
-  expect_equal(wday(posct), 7)
-  expect_equal(yday(posct), 1)
-  expect_equal(month(posct), 1)
-  expect_equal(year(posct), 2011)
-  expect_equal(tz(posct), "UTC")
-
-  expect_equal(second(date), 0)
-  expect_equal(minute(date), 9)
-  expect_equal(hour(date), 1)
-  expect_equal(mday(date), 31)
-  expect_equal(wday(date), 6)
-  expect_equal(yday(date), 365)
-  expect_equal(month(date), 12)
-  expect_equal(year(date), 2010)
-  expect_equal(tz(date), "UTC")
-
-})
-
-test_that("minutes settor does not change time zone", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-    minute(poslt) <- 1
-  minute(posct) <- 1
-  minute(date) <- 1
-
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-
-  minute(poslt) <- 70
-  minute(posct) <- 70
-  minute(date) <- 70
-
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-})
-
-
-test_that("minutes settor returns NA for spring dst gap", {
-  poslt <- as.POSIXlt("2010-03-14 01:59:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  poslt <- force_tz(poslt, tzone = "America/New_York")
-  posct <- as.POSIXct(poslt)
-
-  minute(poslt) <- 70
-  minute(posct) <- 70
-
-  expect_true(is.na(poslt))
-  expect_true(is.na(posct))
-
-})
-
-test_that("minutes settor retains object class", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  minute(poslt) <- 1
-  minute(posct) <- 1
-  minute(date) <- 1
-
-  expect_is("minute<-"(poslt, 1), "POSIXlt")
-  expect_is("minute<-"(posct, 1), "POSIXct")
-  expect_is("minute<-"(date, 1), "POSIXlt")
-
-  minute(poslt) <- 70
-  minute(posct) <- 70
-  minute(date) <- 70
-
-  expect_is("minute<-"(poslt, 70), "POSIXlt")
-  expect_is("minute<-"(posct, 70), "POSIXct")
-  expect_is("minute<-"(date, 70), "POSIXlt")
-
-})
-
-test_that("hours settor correctly performs simple updates", {
-  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  hour(poslt) <- 10
-  hour(posct) <- 10
-  hour(date) <- 10
-
-  expect_equal(hour(poslt), 10)
-  expect_equal(hour(posct), 10)
-  expect_equal(hour(date), 10)
-
-})
-
-test_that("hours settor rolls over as expected", {
-  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  hour(poslt) <- 25
-  hour(posct) <- 25
-  hour(date) <- 25
-
-  expect_equal(second(poslt), 59)
-  expect_equal(minute(poslt), 59)
-  expect_equal(hour(poslt), 1)
-  expect_equal(mday(poslt), 1)
-  expect_equal(wday(poslt), 7)
-  expect_equal(yday(poslt), 1)
-  expect_equal(month(poslt), 1)
-  expect_equal(year(poslt), 2011)
-  expect_equal(tz(poslt), "UTC")
-
-  expect_equal(second(posct), 59)
-  expect_equal(minute(posct), 59)
-  expect_equal(hour(posct), 1)
-  expect_equal(mday(posct), 1)
-  expect_equal(wday(posct), 7)
-  expect_equal(yday(posct), 1)
-  expect_equal(month(posct), 1)
-  expect_equal(year(posct), 2011)
-  expect_equal(tz(posct), "UTC")
-
-  expect_equal(second(date), 0)
-  expect_equal(minute(date), 0)
-  expect_equal(hour(date), 1)
-  expect_equal(mday(date), 1)
-  expect_equal(wday(date), 7)
-  expect_equal(yday(date), 1)
-  expect_equal(month(date), 01)
-  expect_equal(year(date), 2011)
-  expect_equal(tz(date), "UTC")
-
-})
-
-test_that("hours settor does not change time zone", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  hour(poslt) <- 1
-  hour(posct) <- 1
-  hour(date) <- 1
-
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-
-  hour(poslt) <- 70
-  hour(posct) <- 70
-  hour(date) <- 70
-
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-})
-
-
-test_that("hours settor returns NA for spring dst gap", {
-  poslt <- as.POSIXlt("2010-03-14 01:59:59", tz = "UTC", format = "%Y-%m-%d %H:%M:%S")
-  poslt <- force_tz(poslt, tzone = "America/New_York")
-  posct <- as.POSIXct(poslt)
-
-  hour(poslt) <- 2
-  hour(posct) <- 2
-
-  expect_true(is.na(poslt))
-  expect_true(is.na(posct))
-
-})
-
-test_that("hours settor retains object class", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  hour(poslt) <- 2
-  hour(posct) <- 2
-  hour(date) <- 2
-
-  expect_is(poslt, "POSIXlt")
-  expect_is(posct, "POSIXct")
-  expect_is(date, "POSIXlt")
-
-  hour(poslt) <- 25
-  hour(posct) <- 25
-  hour(date) <- 25
-
-  expect_is(poslt, "POSIXlt")
-  expect_is(posct, "POSIXct")
-  expect_is(date, "POSIXlt")
-
-})
-
-
 
 test_that("mdays settor correctly performs simple updates", {
   poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
@@ -450,7 +90,6 @@ test_that("mdays settor does not change time zone", {
   expect_match(tz(date), "UTC")
 })
 
-
 test_that("mdays settor returns NA for spring dst gap", {
   poslt <- as.POSIXlt("2010-03-13 02:59:59", tz = "UTC", format
      = "%Y-%m-%d %H:%M:%S")
@@ -489,8 +128,6 @@ test_that("mdays settor retains object class", {
 
 })
 
-
-
 test_that("ydays settor correctly performs simple updates", {
   poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
      = "%Y-%m-%d %H:%M:%S")
@@ -579,7 +216,6 @@ test_that("ydays settor does not change time zone", {
   expect_match(tz(date), "UTC")
 })
 
-
 test_that("ydays settor returns NA for spring dst gap", {
   poslt <- as.POSIXlt("2010-03-13 02:59:59", tz = "UTC", format
      = "%Y-%m-%d %H:%M:%S")
@@ -618,8 +254,6 @@ test_that("ydays settor retains object class", {
 
 })
 
-
-
 test_that("wdays settor correctly performs simple updates", {
   poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
      = "%Y-%m-%d %H:%M:%S")
@@ -709,7 +343,6 @@ test_that("wdays settor does not change time zone", {
   expect_match(tz(date), "UTC")
 })
 
-
 test_that("wdays settor returns NA for spring dst gap", {
   poslt <- as.POSIXlt("2010-03-13 02:59:59", tz = "UTC", format
      = "%Y-%m-%d %H:%M:%S")
@@ -749,244 +382,13 @@ test_that("wdays settor retains object class", {
 })
 
 
-test_that("months settor correctly performs simple updates", {
-  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  month(poslt) <- 5
-  month(posct) <- 5
-  month(date) <- 5
-
-  expect_equal(month(poslt), 5)
-  expect_equal(month(posct), 5)
-  expect_equal(month(date), 5)
-})
-
-test_that("months settor rolls over as expected", {
-  poslt <- as.POSIXlt("2010-12-31 23:59:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-    month(poslt) <- 13
-  month(posct) <- 13
-  month(date) <- 13
-
-  expect_equal(second(poslt), 59)
-  expect_equal(minute(poslt), 59)
-  expect_equal(hour(poslt), 23)
-  expect_equal(mday(poslt), 31)
-  expect_equal(wday(poslt), 2)
-  expect_equal(yday(poslt), 31)
-  expect_equal(month(poslt), 1)
-  expect_equal(year(poslt), 2011)
-  expect_equal(tz(poslt), "UTC")
-
-  expect_equal(second(posct), 59)
-  expect_equal(minute(posct), 59)
-  expect_equal(hour(posct), 23)
-  expect_equal(mday(posct), 31)
-  expect_equal(wday(posct), 2)
-  expect_equal(yday(posct), 31)
-  expect_equal(month(posct), 1)
-  expect_equal(year(posct), 2011)
-  expect_equal(tz(posct), "UTC")
-
-  expect_equal(second(date), 0)
-  expect_equal(minute(date), 0)
-  expect_equal(hour(date), 0)
-  expect_equal(mday(date), 31)
-  expect_equal(wday(date), 2)
-  expect_equal(yday(date), 31)
-  expect_equal(month(date), 1)
-  expect_equal(year(date), 2011)
-  expect_equal(tz(date), "UTC")
-
-})
-
-test_that("months settor does not change time zone", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-    month(poslt) <- 1
-  month(posct) <- 1
-  month(date) <- 1
-
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-
-    month(poslt) <- 13
-  month(posct) <- 13
-  month(date) <- 13
-
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-})
-
-
-test_that("months settor returns NA for spring dst gap", {
-  poslt <- as.POSIXlt("2010-02-14 02:59:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  poslt <- force_tz(poslt, tzone = "America/New_York")
-  posct <- as.POSIXct(poslt)
-
-  month(poslt) <- 3
-  month(posct) <- 3
-
-  expect_true(is.na(poslt))
-  expect_true(is.na(posct))
-})
-
-test_that("months settor retains object class", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  month(poslt) <- 1
-  month(posct) <- 1
-  month(date) <- 1
-
-  expect_is(poslt, "POSIXlt")
-  expect_is(posct, "POSIXct")
-  expect_is(date, "Date")
-
-  month(poslt) <- 13
-  month(posct) <- 13
-  month(date) <- 13
-
-  expect_is(poslt, "POSIXlt")
-  expect_is(posct, "POSIXct")
-  expect_is(date, "Date")
-
-})
-
-
-test_that("years settor correctly performs simple updates", {
-  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  year(poslt) <- 2000
-  year(posct) <- 2000
-  year(date) <- 2000
-
-  expect_equal(year(poslt), 2000)
-  expect_equal(year(posct), 2000)
-  expect_equal(year(date), 2000)
-})
-
-
-test_that("years settor does not change time zone", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  year(poslt) <- 2000
-  year(posct) <- 2000
-  year(date) <- 2000
-
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-})
-
-
-test_that("years settor returns NA for spring dst gap", {
-  poslt <- as.POSIXlt("2009-03-14 02:59:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  poslt <- force_tz(poslt, tzone = "America/New_York")
-  posct <- as.POSIXct(poslt)
-
-  year(poslt) <- 2010
-  year(posct) <- 2010
-
-  expect_true(is.na(poslt))
-  expect_true(is.na(posct))
-
-})
-
-test_that("years settor retains object class", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  year(poslt) <- 2000
-  year(posct) <- 2000
-  year(date) <- 2000
-
-  expect_is(poslt, "POSIXlt")
-  expect_is(posct, "POSIXct")
-  expect_is(date, "Date")
-})
-
-
-test_that("dates settor correctly performs simple updates", {
-  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  date(poslt) <- as.Date("2000-01-01")
-  date(posct) <- as.Date("2000-01-01")
-  date(date) <- as.Date("2000-01-01")
-
-  expect_equal(date(poslt), as.Date("2000-01-01"))
-  expect_equal(date(posct), as.Date("2000-01-01"))
-  expect_equal(date(date), as.Date("2000-01-01"))
-})
-
-test_that("dates settor does not change time zone", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
-
-  date(poslt) <- as.Date("2000-01-01")
-  date(posct) <- as.Date("2000-01-01")
-  date(date) <- as.Date("2000-01-01")
 
-  expect_match(tz(poslt), "GMT")
-  expect_match(tz(posct), "GMT")
-  expect_match(tz(date), "UTC")
-})
 
-test_that("dates settor returns NA for spring dst gap", {
-  poslt <- as.POSIXlt("2009-03-14 02:59:59", tz = "UTC", format
-     = "%Y-%m-%d %H:%M:%S")
-  poslt <- force_tz(poslt, tzone = "America/New_York")
-  posct <- as.POSIXct(poslt)
 
-  date(poslt) <- as.Date("2010-03-14")
-  date(posct) <- as.Date("2010-03-14")
 
-  expect_true(is.na(poslt))
-  expect_true(is.na(posct))
-})
 
-test_that("dates settor retains object class", {
-  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "GMT", format
-     = "%Y-%m-%d %H:%M:%S")
-  posct <- as.POSIXct(poslt)
-  date <- as.Date(poslt)
 
-  date(poslt) <- as.Date("2000-01-01")
-  date(posct) <- as.Date("2000-01-01")
-  date(date) <- as.Date("2000-01-01")
 
-  expect_is(poslt, "POSIXlt")
-  expect_is(posct, "POSIXct")
-  expect_is(date, "Date")
-})
 
 
 test_that("time zone settor correctly performs simple updates", {
@@ -1004,7 +406,6 @@ test_that("time zone settor correctly performs simple updates", {
   expect_match(tz(date), "UTC")
 })
 
-
 test_that("time zone settor returns NA for spring dst gap", {
   poslt <- as.POSIXlt("2010-03-14 02:30:59", tz = "UTC", format
      = "%Y-%m-%d %H:%M:%S")
diff --git a/tests/testthat/test-time-zones.R b/tests/testthat/test-time-zones.R
new file mode 100644
index 00000000..75fccc6c
--- /dev/null
+++ b/tests/testthat/test-time-zones.R
@@ -0,0 +1,44 @@
+context("Settors")
+
+test_that("time zone settor correctly performs simple updates", {
+  poslt <- as.POSIXlt("2010-02-03 13:45:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  tz(poslt) <- "GMT"
+  tz(posct) <- "GMT"
+  tz(date) <- "GMT" # dates do not have a tz attribute
+
+  expect_match(tz(poslt), "GMT")
+  expect_match(tz(posct), "GMT")
+  expect_match(tz(date), "UTC")
+})
+
+test_that("time zone settor returns NA for spring dst gap", {
+  poslt <- as.POSIXlt("2010-03-14 02:30:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+
+  tz(poslt) <- "America/New_York"
+  tz(posct) <- "America/New_York"
+
+  expect_true(is.na(poslt))
+  expect_true(is.na(posct))
+
+})
+
+test_that("time zone settor retains object class", {
+  poslt <- as.POSIXlt("2010-02-14 01:59:59", tz = "UTC", format
+                      = "%Y-%m-%d %H:%M:%S")
+  posct <- as.POSIXct(poslt)
+  date <- as.Date(poslt)
+
+  tz(poslt) <- "GMT"
+  tz(posct) <- "GMT"
+  tz(date) <- "GMT"
+
+  expect_is(poslt, "POSIXlt")
+  expect_is(posct, "POSIXct")
+  expect_is(date, "Date")
+})