jdk

1d07d95a - updates tests and remove old class