add multivalue test
refactoring test