Fixed some test classes for avoid build failure