Merge "Modify test cae for adding more error codes."