re-fix tests