More tests and fixes for selector extend