Merge "Added test for selector visibility correctness"