add test for key
build structure of resource
Merge remote-tracking branch 'origin/master'