Adding Java 7 patch, support running tests on Java 7