Updated testcases
Version 3.1.0
updated from master