Add a jdk 8 solution for the second test.