gsi: fix unit tests to work with Java7