Separated concernes, added relative tests