Test on 2.1 also. Drop multiple JDK test.