fix impacted tests, live a happy life