Feature/fix test selectors

fix selectors from #777