QuerySelect and QuerySelectList

Same here: separate tests for a callable `key` from tests for a string `key`.