MOD move testing related funcs back _test.go files