Fix outdated unit tests