Updates in the vectorization utils + added tests