modified ACImpl and test class