minor changes in test framework (we have problems with jdk8)