Tests refactoring.
Minor cleanup in ElementSelectors.
More cleanup in element selectors.