Fix a couple failing tests due to element name change