Fix test cases for AR 4.0 and 4.1