Job: #104 Update test element names for easier locating