tests
add list keys
small fix