fix tests which required older, bad behavior