renamed test, removed duplicated test util