refactor map, vector. composition tests