LPS-49773 Simplify more tests using same pattern

cc /@mdelapenya @sergiogonzalez