Added tests & vector_map