trying to fix failures in tests