Merge branch 'ypankratyev/goto_testdata_fixes'