Fixing some broken selectors in tests