Correct failing tests