changed structure of _test.go files