diff --git a/tests/testthat/test-cetesb_retrieve_met_pol.R b/tests/testthat/test-cetesb_retrieve_met_pol.R
index 7151ee6..df1091f 100644
--- a/tests/testthat/test-cetesb_retrieve_met_pol.R
+++ b/tests/testthat/test-cetesb_retrieve_met_pol.R
@@ -1,7 +1,5 @@
 test_that("cetesb_retrieve_met_pol works!", {
 
-  load("sysdata.rda")
-
   pinheiros <- cetesb_retrieve_met_pol(u,p,aqs_code = 99,
                                        start_date   = "01/01/2020",
                                        end_date     = "07/01/2020")
@@ -12,20 +10,34 @@ test_that("cetesb_retrieve_met_pol works!", {
 
   # Testing data.frame values
   param_means<- colMeans(pinheiros[, 2:13], na.rm = TRUE)
-  expect_equal(param_means["tc"] > 23, param_means["tc"] < 24)
-  expect_equal(param_means["rh"] > 74, param_means["rh"] < 75)
-  expect_equal(param_means["ws"] > 1, param_means["ws"] < 2)
-  expect_equal(param_means["wd"] > 238, param_means["wd"] < 239)
-  expect_equal(param_means["o3"] > 27, param_means["o3"] < 28)
-  expect_equal(param_means["no"] > 8, param_means["no"] < 9)
-  expect_equal(param_means["no2"] > 26, param_means["no2"] < 27)
-  expect_equal(param_means["nox"] > 20, param_means["nox"] < 21)
-  expect_equal(param_means["co"] > 0.3, param_means["co"] < 0.4)
-  expect_equal(param_means["pm10"] > 19, param_means["pm10"] < 20)
-  expect_equal(param_means["pm25"] > 5, param_means["pm25"] < 7)
+  expect_lt(param_means["tc"], 23)
+  expect_gt(param_means["tc"], 24)
+  expect_lt(param_means["rh"], 74)
+  expect_gt(param_means["rh"], 75)
+  expect_lt(param_means["ws"], 1)
+  expect_gt(param_means["ws"], 2)
+  expect_lt(param_means["wd"], 238)
+  expect_gt(param_means["wd"], 239)
+  expect_lt(param_means["o3"], 27)
+  expect_gt(param_means["o3"], 28)
+  expect_lt(param_means["no"], 8)
+  expect_gt(param_means["no"], 9)
+  expect_lt(param_means["no2"], 26)
+  expect_gt(param_means["no2"], 27)
+  expect_lt(param_means["nox"], 20)
+  expect_gt(param_means["nox"], 21)
+  expect_lt(param_means["co"], 0.3)
+  expect_gt(param_means["co"], 0.4)
+  expect_lt(param_means["pm10"], 19)
+  expect_gt(param_means["pm10"], 20)
+  expect_lt(param_means["pm25"], 5)
+  expect_gt(param_means["pm25"], 7)
 
   # Testing data.frame classes
-  expect_equal(TRUE,  "data.frame" %in% class(pinheiros))
+  expect_s3_class(pinheiros, "data.frame")
+  expect_type(pinheiros$tc, "double")
+  # but probably better
+  # expect_setequal(unname(apply(pinheiros, 2, class)), c(<vector-of-classes>))
   expect_equal(TRUE,  "numeric" %in% class(pinheiros$tc))
   expect_equal(TRUE,  "numeric" %in% class(pinheiros$rh))
   expect_equal(TRUE,  "numeric" %in% class(pinheiros$ws))