Add the with-selector macro
Add some test data for the selector tests