moved some files around, added queryset.php test