let rest of classes to use dedicated class instead. Corrected failed test caused by this change