Hi. Please take a look on an obvious fix: http://cr.openjdk.java.net/~shurailine/8157996/webrev.00/
There was an unneeded import statement which was getting in the way when running tests with limited module availability. Also in a couple of places I have added try with resources. Shura
