Fixed outdated tests