Match element finding in tests with new structure