Reorganized acc test