Fix test as well