Impact tests fixes