Better handling for empty result sets.
More test data.