repurposed tests given new structure