CARROT-1047: follow-up, moved to src package from tests.