VIVO-766 modify test so it will not fail under Java 8.