Fixed borken tests in AV caused by 013c74d