Integrated new classes for tests