Temporarily fix last tests