Do not check for nil resultsets, which I am comparatively sure cannot occur -- instead, check for EMPTY resultsets.
Refactor test data creation into a set of factory methods as opposed to a class hierarchy, in order to please the test tsar.