xxx
partially fix tests