fixed tests, more accurate queryset checking