Reorganizing some freebie tests