Fixed multiple "CSInterface*_max" testcases.
Merge branch 'master' into testing