Reorganize func tests