Feature/jdk6 support

This PR removes dependencies on JDK7+ and also makes it so tests run at a reasonable rate