updated test locations coming from merge with 1.8 branch