Update the test classes to 1.8 aswell