Correct and adapt tests