partially fix tests