Fix unitgration test too