Fixed embedded collection binding and added tests