Add test for JAVA-597.
Merge pull request #260 from tolbertam/JAVA-597-test

Add test for JAVA-597.