fix failures in tests