Make tests pass. Refactor code dealing with feedbacks.