simplify test
use different key & value in map field test
set support