First version of fixed and updated testcases