Little improvement to select test