[FIX] Fix cross sectional to longitudinal conversion logic (#1235)

* fix renaming logic

* clean existing test before writting new ones...

* start adding unit tests

* some fixes

* improve code

* additional refactoring

* small fix