[BUGFIX] Fixed testcases