manny things to fix tests