Fix selection tests