Updated tests for column-selector and setting

@donnapep @stulees please review. Thanks.