Reworked the span insertions + comments + fix of tests that were wrong