Fix the tests. Feedback.