Added failing tests and new classes