Updated tests to match java-core changes for issue #328
Merge pull request #364 from couchbase/feature/rebased_issue_328

Updated tests to match java-core changes for issue #328