Merge pull request #255 from datastax/java8-test-compat

Fix tests (unordered map) for Java 8 compatibility