From 218826d78cb9f38fea8ac164a0acd164cba180a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Garc=C3=ADa=20Morillo?= <davidgmorillop@gmail.com>
Date: Fri, 18 Oct 2024 23:02:45 +0200
Subject: [PATCH] Fixed tests

---
 src/boxes/stbox.rs                        |  14 +--
 src/boxes/tbox.rs                         | 115 +++++++++++-----------
 src/collections/base/span.rs              |   8 +-
 src/collections/datetime/date_span.rs     |  40 ++++----
 src/collections/datetime/date_span_set.rs |  36 +++----
 src/collections/datetime/tstz_span.rs     |  40 ++++----
 src/collections/datetime/tstz_span_set.rs |  36 +++----
 src/collections/number/float_span.rs      |  32 +++---
 src/collections/number/float_span_set.rs  |  40 ++++----
 src/collections/number/int_span.rs        |  40 ++++----
 src/collections/number/int_span_set.rs    |  38 +++----
 src/lib.rs                                |   2 +-
 src/temporal/ttext.rs                     |   1 +
 13 files changed, 221 insertions(+), 221 deletions(-)

diff --git a/src/boxes/stbox.rs b/src/boxes/stbox.rs
index 38ec885..086f555 100644
--- a/src/boxes/stbox.rs
+++ b/src/boxes/stbox.rs
@@ -54,8 +54,8 @@ impl MeosBox for STBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::stbox::STBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::STBox;
+    /// use meos::Box;
     /// use chrono::{Utc, TimeZone};
     /// let datetime = Utc.with_ymd_and_hms(2020, 5, 15, 12, 0, 0).unwrap();
     /// let stbox = STBox::from_time(datetime);
@@ -291,7 +291,7 @@ impl cmp::PartialEq for STBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::stbox::STBox;
+    /// # use meos::STBox;
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
     /// # meos_initialize();
@@ -338,10 +338,10 @@ impl std::str::FromStr for STBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::stbox::STBox;
-    /// # use meos::collections::base::span::Span;
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::STBox;
+    /// # use meos::Span;
+    /// # use meos::TsTzSpan;
+    /// use meos::Box;
     /// use std::str::FromStr;
     /// # use meos::meos_initialize;
     /// # meos_initialize();
diff --git a/src/boxes/tbox.rs b/src/boxes/tbox.rs
index f74564b..8691af2 100644
--- a/src/boxes/tbox.rs
+++ b/src/boxes/tbox.rs
@@ -56,8 +56,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// use chrono::{Utc, TimeZone};
     /// let datetime = Utc.with_ymd_and_hms(2020, 5, 15, 12, 0, 0).unwrap();
     /// let tbox = TBox::from_time(datetime);
@@ -76,8 +76,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// # use meos::meos_initialize;
     /// use chrono::{Utc, TimeZone, TimeDelta};
     /// # meos_initialize();
@@ -113,8 +113,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox = TBox::from_int(5);
     /// assert!(tbox.has_x());
     /// ```
@@ -129,8 +129,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// use chrono::{Utc, TimeZone};
     /// let datetime = Utc.with_ymd_and_hms(2020, 1, 1, 0, 0, 0).unwrap();
     /// let tbox = TBox::from_time(datetime);
@@ -147,8 +147,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox = TBox::from_float(3.14);
     /// assert_eq!(tbox.xmin(), Some(3.14));
     /// ```
@@ -171,8 +171,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox = TBox::from_float(3.14);
     /// assert_eq!(tbox.xmax(), Some(3.14));
     /// ```
@@ -195,8 +195,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// use chrono::{Utc, TimeZone};
     /// let datetime = Utc.with_ymd_and_hms(2020, 1, 1, 0, 0, 0).unwrap();
     /// let tbox = TBox::from_time(datetime);
@@ -221,8 +221,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// use chrono::{Utc, TimeZone};
     /// let datetime = Utc.with_ymd_and_hms(2020, 1, 1, 0, 0, 0).unwrap();
     /// let tbox = TBox::from_time(datetime);
@@ -246,8 +246,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox = TBox::from_int(5);
     /// assert_eq!(tbox.is_tmin_inclusive(), None); // No temporal dimension
     /// ```
@@ -270,8 +270,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// use chrono::{Utc, TimeZone};
     /// let datetime = Utc.with_ymd_and_hms(2020, 1, 1, 0, 0, 0).unwrap();
     /// let tbox = TBox::from_time(datetime);
@@ -299,8 +299,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// use chrono::{Utc, TimeZone, TimeDelta};
     /// let datetime = Utc.with_ymd_and_hms(2020, 1, 1, 0, 0, 0).unwrap();
     /// let tbox = TBox::from_time(datetime);
@@ -329,8 +329,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox = TBox::from_float(3.141592);
     /// let rounded_tbox = tbox.round(2);
     /// assert_eq!(rounded_tbox.xmin(), Some(3.14));
@@ -351,8 +351,8 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox1 = TBox::from_float(1.0);
     /// let tbox2 = TBox::from_float(5.0);
     /// let distance = tbox1.nearest_approach_distance(&tbox2);
@@ -373,9 +373,9 @@ impl MeosBox for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
+    /// # use meos::TBox;
+    /// use meos::Box;
+    /// # use meos::TsTzSpan;
     /// use chrono::{Utc, TimeZone, TimeDelta};
     /// let datetime1 = Utc.with_ymd_and_hms(2020, 1, 1, 0, 0, 0).unwrap();
     /// let datetime2 = Utc.with_ymd_and_hms(2020, 2, 1, 0, 0, 0).unwrap();
@@ -448,8 +448,8 @@ impl TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox = TBox::from_int(42);
     /// assert_eq!(tbox.xmin().unwrap(), 42.0);
     /// ```
@@ -468,8 +468,8 @@ impl TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox = TBox::from_float(42.0);
     /// assert_eq!(tbox.xmin().unwrap(), 42.0);
     /// ```
@@ -488,10 +488,10 @@ impl TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
-    /// # use meos::collections::base::span::Span;
-    /// # use meos::collections::number::float_span::FloatSpan;
+    /// # use meos::TBox;
+    /// use meos::Box;
+    /// # use meos::Span;
+    /// # use meos::FloatSpan;
     ///
     /// let span: FloatSpan = (42.0..50.0).into();
     /// let tbox = TBox::from_numeric_span(span);
@@ -516,9 +516,9 @@ impl TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
-    /// # use meos::collections::number::int_span::IntSpan;
+    /// # use meos::TBox;
+    /// use meos::Box;
+    /// # use meos::IntSpan;
     ///
     /// let tbox = TBox::from_int(5);
     /// let intspan = tbox.intspan();
@@ -535,9 +535,9 @@ impl TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
-    /// # use meos::collections::number::float_span::FloatSpan;
+    /// # use meos::TBox;
+    /// use meos::Box;
+    /// # use meos::FloatSpan;
     ///
     /// let tbox = TBox::from_float(5.0);
     /// let floatspan = tbox.floatspan();
@@ -556,8 +556,7 @@ impl TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
     /// let tbox = TBox::from_float(3.14);
     /// assert_eq!(tbox.xmin_is_inclusive(), Some(true));
     /// ```
@@ -580,8 +579,8 @@ impl TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox = TBox::from_float(3.14);
     /// assert_eq!(tbox.xmax_is_inclusive(), Some(true)); // Assuming inclusivity is true by default
     /// ```
@@ -608,8 +607,8 @@ impl TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// let tbox = TBox::from_float(3.0);
     /// let expanded_tbox = tbox.expand_value(2.0);
     /// assert_eq!(expanded_tbox.xmin(), Some(1.0));
@@ -630,8 +629,8 @@ impl TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// # use std::str::FromStr;
     /// # use meos::meos_initialize;
     /// # meos_initialize();
@@ -670,8 +669,8 @@ impl cmp::PartialEq for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
+    /// # use meos::TBox;
+    /// use meos::Box;
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
     /// # meos_initialize();
@@ -718,11 +717,11 @@ impl std::str::FromStr for TBox {
     ///
     /// ## Example
     /// ```
-    /// # use meos::boxes::tbox::TBox;
-    /// use meos::boxes::r#box::Box;
-    /// # use meos::collections::base::span::Span;
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
+    /// # use meos::TBox;
+    /// use meos::Box;
+    /// # use meos::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::TsTzSpan;
     /// use std::str::FromStr;
     /// # use meos::meos_initialize;
     /// # meos_initialize();
diff --git a/src/collections/base/span.rs b/src/collections/base/span.rs
index 9c98983..d140ee1 100644
--- a/src/collections/base/span.rs
+++ b/src/collections/base/span.rs
@@ -65,8 +65,8 @@ pub trait Span: Collection {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     ///
     /// let span: FloatSpan = FloatSpan::from_str("[23.9, 78.8]").unwrap();
@@ -86,8 +86,8 @@ pub trait Span: Collection {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     ///
     /// let span: FloatSpan = (23.9..=78.8).into();
diff --git a/src/collections/datetime/date_span.rs b/src/collections/datetime/date_span.rs
index 3cace46..5562b52 100644
--- a/src/collections/datetime/date_span.rs
+++ b/src/collections/datetime/date_span.rs
@@ -61,8 +61,8 @@ impl Span for DateSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// # use chrono::naive::NaiveDate;
     ///
     /// let from_ymd_opt = |y, m, d| NaiveDate::from_ymd_opt(y, m, d).unwrap();
@@ -86,8 +86,8 @@ impl Span for DateSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// # use chrono::naive::NaiveDate;
     ///
     /// let from_ymd_opt = |y, m, d| NaiveDate::from_ymd_opt(y, m, d).unwrap();
@@ -114,8 +114,8 @@ impl Span for DateSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// use chrono::naive::NaiveDate;
     /// use chrono::TimeDelta;
     ///
@@ -140,8 +140,8 @@ impl Span for DateSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// use chrono::naive::NaiveDate;
     /// use chrono::TimeDelta;
     ///
@@ -167,8 +167,8 @@ impl Span for DateSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// use chrono::naive::NaiveDate;
     /// use chrono::TimeDelta;
     ///
@@ -212,10 +212,10 @@ impl Span for DateSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
+    /// # use meos::DateSpan;
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::Span;
     /// use chrono::TimeDelta;
     /// # meos_initialize();
     /// let span1 = DateSpan::from_str("[2019-09-08, 2019-09-10]").unwrap();
@@ -248,8 +248,8 @@ impl Span for DateSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// # use chrono::{TimeDelta, TimeZone, Utc};
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
@@ -304,8 +304,8 @@ impl std::str::FromStr for DateSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     /// # use meos::meos_initialize;
     /// use chrono::NaiveDate;
@@ -335,8 +335,8 @@ impl cmp::PartialEq for DateSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// use chrono::naive::NaiveDate;
     ///
     /// let from_ymd_opt = |y, m, d| NaiveDate::from_ymd_opt(y, m, d).unwrap();
@@ -417,8 +417,8 @@ impl BitAnd for DateSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     /// use chrono::naive::NaiveDate;
     ///
diff --git a/src/collections/datetime/date_span_set.rs b/src/collections/datetime/date_span_set.rs
index 1443b92..5ec2a79 100644
--- a/src/collections/datetime/date_span_set.rs
+++ b/src/collections/datetime/date_span_set.rs
@@ -62,10 +62,10 @@ impl SpanSet for DateSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span_set::DateSpanSet;
+    /// # use meos::DateSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// use chrono::TimeDelta;
     /// # meos_initialize();
     /// let span_set = DateSpanSet::from_str("{[2019-09-08, 2019-09-10], [2019-09-16, 2019-09-20]}").unwrap();
@@ -89,10 +89,10 @@ impl SpanSet for DateSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span_set::DateSpanSet;
+    /// # use meos::DateSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// use chrono::TimeDelta;
     /// # meos_initialize();
     /// let span_set = DateSpanSet::from_str("{[2019-09-08, 2019-09-10], [2019-09-13, 2019-09-15]}").unwrap();
@@ -117,10 +117,10 @@ impl SpanSet for DateSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span_set::DateSpanSet;
+    /// # use meos::DateSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// use chrono::TimeDelta;
     /// # meos_initialize();
     /// let span_set = DateSpanSet::from_str("{[2019-09-08, 2019-09-10], [2019-09-11, 2019-09-12]}").unwrap();
@@ -157,8 +157,8 @@ impl SpanSet for DateSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span_set::DateSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::DateSpanSet;
+    /// # use meos::SpanSet;
     /// # use chrono::{TimeDelta, TimeZone, NaiveDate};
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
@@ -193,8 +193,8 @@ impl SpanSet for DateSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span_set::DateSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::DateSpanSet;
+    /// # use meos::SpanSet;
     /// # use chrono::{TimeDelta, TimeZone, Utc};
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
@@ -222,10 +222,10 @@ impl SpanSet for DateSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::date_span_set::DateSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::DateSpanSet;
+    /// # use meos::SpanSet;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
     /// # use chrono::{TimeDelta, TimeZone, Utc};
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
@@ -312,10 +312,10 @@ impl BitAnd<DateSpanSet> for DateSpanSet {
     /// ## Example
     ///
     /// ```
-    /// # use meos::collections::datetime::date_span_set::DateSpanSet;
+    /// # use meos::DateSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// # meos_initialize();
     /// let span_set1 = DateSpanSet::from_str("{[2019-09-08, 2019-09-10], [2019-09-15, 2019-09-20]}").unwrap();
     /// let span_set2 = DateSpanSet::from_str("{[2019-09-15, 2019-09-30], [2019-11-11, 2019-11-12]}").unwrap();
@@ -344,10 +344,10 @@ impl BitOr for DateSpanSet {
     /// ## Example
     ///
     /// ```
-    /// # use meos::collections::datetime::date_span_set::DateSpanSet;
+    /// # use meos::DateSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// # meos_initialize();
     /// let span_set1 = DateSpanSet::from_str("{[2019-09-08, 2019-09-10], [2019-09-15, 2019-09-20]}").unwrap();
     /// let span_set2 = DateSpanSet::from_str("{[2019-09-15, 2019-09-30], [2019-11-11, 2019-11-12]}").unwrap();
diff --git a/src/collections/datetime/tstz_span.rs b/src/collections/datetime/tstz_span.rs
index 7f910bf..dc346d5 100644
--- a/src/collections/datetime/tstz_span.rs
+++ b/src/collections/datetime/tstz_span.rs
@@ -62,8 +62,8 @@ impl Span for TsTzSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// # use chrono::naive::NaiveDate;
     ///
     /// let from_ymd_opt = |y, m, d| NaiveDate::from_ymd_opt(y, m, d)
@@ -86,8 +86,8 @@ impl Span for TsTzSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// # use chrono::naive::NaiveDate;
     ///
     /// let from_ymd_opt = |y, m, d| NaiveDate::from_ymd_opt(y, m, d)
@@ -113,8 +113,8 @@ impl Span for TsTzSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// # use meos::meos_initialize;
     /// use chrono::naive::NaiveDate;
     /// use chrono::TimeDelta;
@@ -143,8 +143,8 @@ impl Span for TsTzSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// # use meos::meos_initialize;
     /// use chrono::naive::NaiveDate;
     /// use chrono::TimeDelta;
@@ -174,8 +174,8 @@ impl Span for TsTzSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// use chrono::naive::NaiveDate;
     /// use chrono::TimeDelta;
     /// # use meos::meos_initialize;
@@ -219,10 +219,10 @@ impl Span for TsTzSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
+    /// # use meos::TsTzSpan;
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::Span;
     /// use chrono::TimeDelta;
     /// # meos_initialize();
     /// let span1 = TsTzSpan::from_str("[2019-09-08 00:00:00+00, 2019-09-10 00:00:00+00]").unwrap();
@@ -248,8 +248,8 @@ impl Span for TsTzSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// # use chrono::{TimeDelta, TimeZone, Utc};
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
@@ -306,8 +306,8 @@ impl std::str::FromStr for TsTzSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     /// # use meos::{meos_initialize, meos_initialize_timezone};
     /// use chrono::NaiveDate;
@@ -340,8 +340,8 @@ impl cmp::PartialEq for TsTzSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// use chrono::naive::NaiveDate;
     ///
     /// let from_ymd_opt = |y, m, d| NaiveDate::from_ymd_opt(y, m, d)
@@ -411,8 +411,8 @@ impl BitAnd for TsTzSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     /// use chrono::naive::NaiveDate;
     ///
diff --git a/src/collections/datetime/tstz_span_set.rs b/src/collections/datetime/tstz_span_set.rs
index 7638328..dd761a1 100644
--- a/src/collections/datetime/tstz_span_set.rs
+++ b/src/collections/datetime/tstz_span_set.rs
@@ -62,10 +62,10 @@ impl SpanSet for TsTzSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span_set::TsTzSpanSet;
+    /// # use meos::TsTzSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// use chrono::TimeDelta;
     /// # meos_initialize();
     /// let span_set = TsTzSpanSet::from_str("{[2019-09-08 00:00:00+00, 2019-09-10 00:00:00+00], [2019-09-16 00:00:00+00, 2019-09-20 00:00:00+00]}").unwrap();
@@ -89,10 +89,10 @@ impl SpanSet for TsTzSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span_set::TsTzSpanSet;
+    /// # use meos::TsTzSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// use chrono::TimeDelta;
     /// # meos_initialize();
     /// let span_set = TsTzSpanSet::from_str("{[2019-09-08 00:00:00+00, 2019-09-10 00:00:00+00], [2019-09-13 00:00:00+00, 2019-09-15 00:00:00+00]}").unwrap();
@@ -117,10 +117,10 @@ impl SpanSet for TsTzSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span_set::TsTzSpanSet;
+    /// # use meos::TsTzSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// use chrono::TimeDelta;
     /// # meos_initialize();
     /// let span_set = TsTzSpanSet::from_str("{[2019-09-08 00:00:00+00, 2019-09-10 00:00:00+00], [2019-09-11 00:00:00+00, 2019-09-12 00:00:00+00]}").unwrap();
@@ -161,8 +161,8 @@ impl SpanSet for TsTzSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span_set::TsTzSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::TsTzSpanSet;
+    /// # use meos::SpanSet;
     /// # use chrono::{TimeDelta, TimeZone, Utc};
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
@@ -191,8 +191,8 @@ impl SpanSet for TsTzSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span_set::TsTzSpanSet;
-    /// # use crate::meos::collections::base::span_set::SpanSet;
+    /// # use meos::TsTzSpanSet;
+    /// # use crate::meos::SpanSet;
     /// # use chrono::{TimeDelta, TimeZone, Utc};
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
@@ -221,10 +221,10 @@ impl SpanSet for TsTzSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::datetime::tstz_span_set::TsTzSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
-    /// # use meos::collections::datetime::tstz_span::TsTzSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::TsTzSpanSet;
+    /// # use meos::SpanSet;
+    /// # use meos::TsTzSpan;
+    /// # use meos::Span;
     /// # use chrono::{TimeDelta, TimeZone, Utc};
     /// # use meos::meos_initialize;
     /// use std::str::FromStr;
@@ -303,10 +303,10 @@ impl BitAnd<TsTzSpanSet> for TsTzSpanSet {
     /// ## Example
     ///
     /// ```
-    /// # use meos::collections::datetime::tstz_span_set::TsTzSpanSet;
+    /// # use meos::TsTzSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// # meos_initialize();
     /// let span_set1 = TsTzSpanSet::from_str("{[2019-09-08 00:00:00+00, 2019-09-10 00:00:00+00], [2019-09-15 00:00:00+00, 2019-09-20 00:00:00+00]}").unwrap();
     /// let span_set2 = TsTzSpanSet::from_str("{[2019-09-15 00:00:00+00, 2019-09-30 00:00:00+00], [2019-11-11 00:00:00+00, 2019-11-12 00:00:00+00]}").unwrap();
@@ -335,10 +335,10 @@ impl BitOr for TsTzSpanSet {
     /// ## Example
     ///
     /// ```
-    /// # use meos::collections::datetime::tstz_span_set::TsTzSpanSet;
+    /// # use meos::TsTzSpanSet;
     /// # use meos::meos_initialize;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     /// # meos_initialize();
     /// let span_set1 = TsTzSpanSet::from_str("{[2019-09-08 00:00:00+00, 2019-09-10 00:00:00+00], [2019-09-15 00:00:00+00, 2019-09-20 00:00:00+00]}").unwrap();
     /// let span_set2 = TsTzSpanSet::from_str("{[2019-09-15 00:00:00+00, 2019-09-30 00:00:00+00], [2019-11-11 00:00:00+00, 2019-11-12 00:00:00+00]}").unwrap();
diff --git a/src/collections/number/float_span.rs b/src/collections/number/float_span.rs
index 2c66aba..11edfed 100644
--- a/src/collections/number/float_span.rs
+++ b/src/collections/number/float_span.rs
@@ -56,8 +56,8 @@ impl Span for FloatSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     ///
     /// let span: FloatSpan = (12.9..67.8).into();
     /// let lower = span.lower();
@@ -73,8 +73,8 @@ impl Span for FloatSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     ///
     /// let span: FloatSpan = (12.9..67.8).into();;
     ///
@@ -94,8 +94,8 @@ impl Span for FloatSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     ///
     /// let span: FloatSpan = (12.9..67.8).into();
     /// let shifted_span = span.shift(5.0);
@@ -116,8 +116,8 @@ impl Span for FloatSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     ///
     /// let span: FloatSpan = (12.9..67.8).into();
     /// let scaled_span = span.scale(10.0);
@@ -139,8 +139,8 @@ impl Span for FloatSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     ///
     /// let span: FloatSpan = (12.9..67.8).into();
     /// let shifted_scaled_span = span.shift_scale(Some(5.0), Some(10.0));
@@ -197,8 +197,8 @@ impl std::str::FromStr for FloatSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     ///
     /// let span: FloatSpan = "(12.9, 67.8)".parse().expect("Failed to parse span");
@@ -224,8 +224,8 @@ impl cmp::PartialEq for FloatSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     ///
     /// let span1: FloatSpan = (12.9..67.8).into();
@@ -294,8 +294,8 @@ impl BitAnd for FloatSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span::FloatSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     ///
     /// let span1: FloatSpan = (12.9..67.8).into();
diff --git a/src/collections/number/float_span_set.rs b/src/collections/number/float_span_set.rs
index 46667de..b3fbf45 100644
--- a/src/collections/number/float_span_set.rs
+++ b/src/collections/number/float_span_set.rs
@@ -60,9 +60,9 @@ impl SpanSet for FloatSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span_set::FloatSpanSet;
+    /// # use meos::FloatSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span = FloatSpanSet::from_str("{[17.5, 18.5), [19.5, 20.5)}").unwrap();
     /// let shifted_span = span.shift(5.0);
@@ -85,9 +85,9 @@ impl SpanSet for FloatSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span_set::FloatSpanSet;
+    /// # use meos::FloatSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span = FloatSpanSet::from_str("{[17.5, 18.5), [19.5, 20.5)}").unwrap();
     /// let scaled_span = span.scale(2.0);
@@ -111,9 +111,9 @@ impl SpanSet for FloatSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span_set::FloatSpanSet;
+    /// # use meos::FloatSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span = FloatSpanSet::from_str("{[17.5, 18.5), [19.5, 20.5)}").unwrap();
     /// let shifted_scaled_span = span.shift_scale(Some(5.0), Some(2.5));
@@ -141,8 +141,8 @@ impl SpanSet for FloatSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span_set::FloatSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::FloatSpanSet;
+    /// # use meos::SpanSet;
     /// let span_set: FloatSpanSet = [(2019.0..2023.5).into(), (2029.0..2030.5).into()].iter().collect();
     /// let distance = span_set.distance_to_value(&2032.5);
     /// assert_eq!(distance, 2.0);
@@ -161,9 +161,9 @@ impl SpanSet for FloatSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span_set::FloatSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::FloatSpanSet;
+    /// # use meos::SpanSet;
+    /// # use meos::Span;
     ///
     /// let span_set1: FloatSpanSet = [(2019.0..2023.5).into(), (2029.0..2030.5).into()].iter().collect();
     /// let span_set2: FloatSpanSet = [(2049.0..2050.5).into(), (2059.0..2600.5).into()].iter().collect();
@@ -184,11 +184,11 @@ impl SpanSet for FloatSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::float_span_set::FloatSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
-    /// # use meos::collections::datetime::date_span::DateSpan;
-    /// # use meos::collections::base::span::Span;
-    /// # use meos::collections::number::float_span::FloatSpan;
+    /// # use meos::FloatSpanSet;
+    /// # use meos::SpanSet;
+    /// # use meos::DateSpan;
+    /// # use meos::Span;
+    /// # use meos::FloatSpan;
     ///
     /// let span_set: FloatSpanSet = [(2019.0..2023.5).into(), (2029.0..2030.5).into()].iter().collect();
     /// let span: FloatSpan = (2009.0..2013.5).into();
@@ -262,9 +262,9 @@ impl BitAnd<FloatSpanSet> for FloatSpanSet {
     /// ## Example
     ///
     /// ```
-    /// # use meos::collections::number::float_span_set::FloatSpanSet;
+    /// # use meos::FloatSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span_set1 = FloatSpanSet::from_str("{[17.5, 18.5), [19.5, 20.5)}").unwrap();
     /// let span_set2 = FloatSpanSet::from_str("{[19.5, 23.5), [45.5, 67.5)}").unwrap();
@@ -293,9 +293,9 @@ impl BitOr for FloatSpanSet {
     /// ## Example
     ///
     /// ```
-    /// # use meos::collections::number::float_span_set::FloatSpanSet;
+    /// # use meos::FloatSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span_set1 = FloatSpanSet::from_str("{[17.5, 18.5), [19.5, 20.5)}").unwrap();
     /// let span_set2 = FloatSpanSet::from_str("{[19.5, 23.5), [45.5, 67.5)}").unwrap();
diff --git a/src/collections/number/int_span.rs b/src/collections/number/int_span.rs
index 2905108..26118f8 100644
--- a/src/collections/number/int_span.rs
+++ b/src/collections/number/int_span.rs
@@ -56,8 +56,8 @@ impl Span for IntSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     ///
     /// let span: IntSpan = (12..67).into();
     /// let lower = span.lower();
@@ -73,8 +73,8 @@ impl Span for IntSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     ///
     /// let span: IntSpan = (12..67).into();;
     ///
@@ -94,8 +94,8 @@ impl Span for IntSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     ///
     /// let span: IntSpan = (12..67).into();
     /// let shifted_span = span.shift(5);
@@ -116,8 +116,8 @@ impl Span for IntSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     ///
     /// let span: IntSpan = (12..67).into();
     /// let scaled_span = span.scale(10);
@@ -139,8 +139,8 @@ impl Span for IntSpan {
     ///
     /// # Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     ///
     /// let span: IntSpan = (12..67).into();
     /// let shifted_scaled_span = span.shift_scale(Some(5), Some(10));
@@ -166,8 +166,8 @@ impl Span for IntSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     ///
     /// let span: IntSpan = (12..67).into();
     /// let distance = span.distance_to_value(&8);
@@ -188,8 +188,8 @@ impl Span for IntSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     ///
     /// let span1: IntSpan = (12..67).into();
     /// let span2: IntSpan = (10..11).into();
@@ -234,8 +234,8 @@ impl std::str::FromStr for IntSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     ///
     /// let span: IntSpan = "(12, 67)".parse().expect("Failed to parse span");
@@ -261,8 +261,8 @@ impl cmp::PartialEq for IntSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     ///
     /// let span1: IntSpan = (12..67).into();
@@ -323,8 +323,8 @@ impl BitAnd for IntSpan {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span::IntSpan;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpan;
+    /// # use meos::Span;
     /// # use std::str::FromStr;
     ///
     /// let span1: IntSpan = (12..67).into();
diff --git a/src/collections/number/int_span_set.rs b/src/collections/number/int_span_set.rs
index 658508e..9623d6c 100644
--- a/src/collections/number/int_span_set.rs
+++ b/src/collections/number/int_span_set.rs
@@ -58,9 +58,9 @@ impl SpanSet for IntSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span_set::IntSpanSet;
+    /// # use meos::IntSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span = IntSpanSet::from_str("{[17, 18), [19, 20)}").unwrap();
     /// let shifted_span = span.shift(5);
@@ -83,9 +83,9 @@ impl SpanSet for IntSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span_set::IntSpanSet;
+    /// # use meos::IntSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span = IntSpanSet::from_str("{[17, 18), [19, 23)}").unwrap();
     /// let scaled_span = span.scale(5);
@@ -109,9 +109,9 @@ impl SpanSet for IntSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span_set::IntSpanSet;
+    /// # use meos::IntSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span = IntSpanSet::from_str("{[17, 18), [19, 20)}").unwrap();
     /// let shifted_scaled_span = span.shift_scale(Some(5), Some(2));
@@ -139,8 +139,8 @@ impl SpanSet for IntSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span_set::IntSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::IntSpanSet;
+    /// # use meos::SpanSet;
     /// let span_set: IntSpanSet = [(2019..2023).into(), (2029..2030).into()].iter().collect();
     /// let distance = span_set.distance_to_value(&2032);
     /// assert_eq!(distance, 3);
@@ -159,9 +159,9 @@ impl SpanSet for IntSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span_set::IntSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
-    /// # use meos::collections::base::span::Span;
+    /// # use meos::IntSpanSet;
+    /// # use meos::SpanSet;
+    /// # use meos::Span;
     ///
     /// let span_set1: IntSpanSet = [(2019..2023).into(), (2029..2030).into()].iter().collect();
     /// let span_set2: IntSpanSet = [(2049..2050).into(), (2059..2600).into()].iter().collect();
@@ -183,10 +183,10 @@ impl SpanSet for IntSpanSet {
     ///
     /// ## Example
     /// ```
-    /// # use meos::collections::number::int_span_set::IntSpanSet;
-    /// # use meos::collections::base::span_set::SpanSet;
-    /// # use meos::collections::base::span::Span;
-    /// # use meos::collections::number::int_span::IntSpan;
+    /// # use meos::IntSpanSet;
+    /// # use meos::SpanSet;
+    /// # use meos::Span;
+    /// # use meos::IntSpan;
     ///
     /// let span_set: IntSpanSet = [(2019..2023).into(), (2029..2030).into()].iter().collect();
     /// let span: IntSpan = (2009..2010).into();
@@ -260,9 +260,9 @@ impl BitAnd<IntSpanSet> for IntSpanSet {
     /// ## Example
     ///
     /// ```
-    /// # use meos::collections::number::int_span_set::IntSpanSet;
+    /// # use meos::IntSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span_set1 = IntSpanSet::from_str("{[17, 18), [19, 20)}").unwrap();
     /// let span_set2 = IntSpanSet::from_str("{[19, 23), [45, 67)}").unwrap();
@@ -291,9 +291,9 @@ impl BitOr for IntSpanSet {
     /// ## Example
     ///
     /// ```
-    /// # use meos::collections::number::int_span_set::IntSpanSet;
+    /// # use meos::IntSpanSet;
     /// # use std::str::FromStr;
-    /// # use meos::collections::base::span_set::SpanSet;
+    /// # use meos::SpanSet;
     ///
     /// let span_set1 = IntSpanSet::from_str("{[17, 18), [19, 20)}").unwrap();
     /// let span_set2 = IntSpanSet::from_str("{[19, 23), [45, 67)}").unwrap();
diff --git a/src/lib.rs b/src/lib.rs
index 54a5a9b..d6d1c73 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,7 +16,7 @@ use boxes::Box as MeosBox;
 pub use meos_sys as sys;
 
 mod boxes;
-pub use boxes::{STBox, TBox};
+pub use boxes::{Box, STBox, TBox};
 
 mod collections;
 pub use collections::base::{Collection, Span, SpanSet};
diff --git a/src/temporal/ttext.rs b/src/temporal/ttext.rs
index 6888b03..3a85384 100644
--- a/src/temporal/ttext.rs
+++ b/src/temporal/ttext.rs
@@ -603,6 +603,7 @@ impl Temporal for TText {
 }
 
 #[cfg(test)]
+#[serial_test::serial]
 mod tests {
     use crate::{meos_initialize, meos_initialize_timezone};