Merge "Deleting deprecated function and switch test to 2017.7"