Added new classes for tests