Start splitting test into QuerySelector and Selector