Reorganized exclude tests