Java 8

Pulling in changes to test data.