Update tests to reflect rename