Fixing smoke itests to work (also on JDK8)