Merge "Add tests for boolean selectors" into main