Added type selection tests