Enhancement and bug fixes for A class
Clas name for test harmonized