Update tests to match new extend names