Make tests run in 1.8