Refactor tests to reflect changes in element naming