fix tests a bit