Fix outdated tests