1.8 testing

Get testing 1.8 into local master