fix tests based on latest changes