Updating the API to the new API

JAVA-1325
How about a should get database tests that ensure that options are merged properly, etc?