jdk

e1900adb - add types, fix tests