Adjust code after Ilker remarks

The side-by-side tests should remain because it was the intention of the author
to experiment with such kind of coexistence productive code and its tests.