Fix test to work with latest changes