Updated nightly tests to be 8.6.4 and 8.5.18