Some more code testing 2.1 features for Python and Java drivers.
Added some new code to sync up with doc.