Add updated .select method and tests