Revert "Make Travis use JDK7"

This reverts commit a137c5d221553eb2f9b22d2addd400ab08829ecb.
Fix tests