Added the new classes for the failing tests.